lkml.org 
[lkml]   [2018]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 17/18] udf: prevent bounds-check bypass via speculative execution
    From
    Date
    Static analysis reports that 'eahd->appAttrLocation' and
    'eahd->impAttrLocation' may be a user controlled values that are used as
    data dependencies for calculating source and destination buffers for
    memmove operations. In order to avoid potential leaks of kernel memory
    values, block speculative execution of the instruction stream that could
    issue further reads based on invalid 'aal' or 'ial' values.

    Based on an original patch by Elena Reshetova.

    Cc: Jan Kara <jack@suse.com>
    Signed-off-by: Elena Reshetova <elena.reshetova@intel.com>
    Signed-off-by: Dan Williams <dan.j.williams@intel.com>
    ---
    fs/udf/misc.c | 39 +++++++++++++++++++++------------------
    1 file changed, 21 insertions(+), 18 deletions(-)

    diff --git a/fs/udf/misc.c b/fs/udf/misc.c
    index 401e64cde1be..9403160822de 100644
    --- a/fs/udf/misc.c
    +++ b/fs/udf/misc.c
    @@ -51,6 +51,8 @@ struct genericFormat *udf_add_extendedattr(struct inode *inode, uint32_t size,
    int offset;
    uint16_t crclen;
    struct udf_inode_info *iinfo = UDF_I(inode);
    + uint8_t *ea_dst, *ea_src;
    + uint32_t aal, ial;

    ea = iinfo->i_ext.i_data;
    if (iinfo->i_lenEAttr) {
    @@ -100,33 +102,34 @@ struct genericFormat *udf_add_extendedattr(struct inode *inode, uint32_t size,

    offset = iinfo->i_lenEAttr;
    if (type < 2048) {
    - if (le32_to_cpu(eahd->appAttrLocation) <
    - iinfo->i_lenEAttr) {
    - uint32_t aal =
    - le32_to_cpu(eahd->appAttrLocation);
    - memmove(&ea[offset - aal + size],
    - &ea[aal], offset - aal);
    + aal = le32_to_cpu(eahd->appAttrLocation);
    + if ((ea_dst = nospec_array_ptr(ea, offset - aal + size,
    + iinfo->i_lenEAttr)) &&
    + (ea_src = nospec_array_ptr(ea, aal,
    + iinfo->i_lenEAttr))) {
    + memmove(ea_dst, ea_src, offset - aal);
    offset -= aal;
    eahd->appAttrLocation =
    cpu_to_le32(aal + size);
    }
    - if (le32_to_cpu(eahd->impAttrLocation) <
    - iinfo->i_lenEAttr) {
    - uint32_t ial =
    - le32_to_cpu(eahd->impAttrLocation);
    - memmove(&ea[offset - ial + size],
    - &ea[ial], offset - ial);
    +
    + ial = le32_to_cpu(eahd->impAttrLocation);
    + if ((ea_dst = nospec_array_ptr(ea, offset - ial + size,
    + iinfo->i_lenEAttr)) &&
    + (ea_src = nospec_array_ptr(ea, ial,
    + iinfo->i_lenEAttr))) {
    + memmove(ea_dst, ea_src, offset - ial);
    offset -= ial;
    eahd->impAttrLocation =
    cpu_to_le32(ial + size);
    }
    } else if (type < 65536) {
    - if (le32_to_cpu(eahd->appAttrLocation) <
    - iinfo->i_lenEAttr) {
    - uint32_t aal =
    - le32_to_cpu(eahd->appAttrLocation);
    - memmove(&ea[offset - aal + size],
    - &ea[aal], offset - aal);
    + aal = le32_to_cpu(eahd->appAttrLocation);
    + if ((ea_dst = nospec_array_ptr(ea, offset - aal + size,
    + iinfo->i_lenEAttr)) &&
    + (ea_src = nospec_array_ptr(ea, aal,
    + iinfo->i_lenEAttr))) {
    + memmove(ea_dst, ea_src, offset - aal);
    offset -= aal;
    eahd->appAttrLocation =
    cpu_to_le32(aal + size);
    \
     
     \ /
      Last update: 2018-01-06 02:21    [W:4.029 / U:0.336 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site