lkml.org 
[lkml]   [2018]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.14 135/161] cifs: silence compiler warnings showing up with gcc-8.0.0
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    [ Upstream commit ade7db991b47ab3016a414468164f4966bd08202 ]

    This bug was fixed before, but came up again with the latest
    compiler in another function:

    fs/cifs/cifssmb.c: In function 'CIFSSMBSetEA':
    fs/cifs/cifssmb.c:6362:3: error: 'strncpy' offset 8 is out of the bounds [0, 4] [-Werror=array-bounds]
    strncpy(parm_data->list[0].name, ea_name, name_len);

    Let's apply the same fix that was used for the other instances.

    Fixes: b2a3ad9ca502 ("cifs: silence compiler warnings showing up with gcc-4.7.0")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Steve French <smfrench@gmail.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    fs/cifs/cifssmb.c | 4 +---
    1 file changed, 1 insertion(+), 3 deletions(-)

    diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
    index 35dc5bf01ee2..7fd39ea6e22e 100644
    --- a/fs/cifs/cifssmb.c
    +++ b/fs/cifs/cifssmb.c
    @@ -6331,9 +6331,7 @@ SetEARetry:
    pSMB->InformationLevel =
    cpu_to_le16(SMB_SET_FILE_EA);

    - parm_data =
    - (struct fealist *) (((char *) &pSMB->hdr.Protocol) +
    - offset);
    + parm_data = (void *)pSMB + offsetof(struct smb_hdr, Protocol) + offset;
    pSMB->ParameterOffset = cpu_to_le16(param_offset);
    pSMB->DataOffset = cpu_to_le16(offset);
    pSMB->SetupCount = 1;
    --
    2.15.1
    \
     
     \ /
      Last update: 2018-04-09 04:55    [W:4.129 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site