cifs: silence compiler warnings showing up with gcc-8.0.0
authorArnd Bergmann <arnd@arndb.de>
Fri, 2 Feb 2018 15:48:47 +0000 (16:48 +0100)
committerSteve French <smfrench@gmail.com>
Wed, 7 Feb 2018 15:36:41 +0000 (09:36 -0600)
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>
fs/cifs/cifssmb.c

index 4e0922d24eb216d3549e6a09958825de7616b51e..9ceebf30eb22e905303ad714b50150cbf16c7457 100644 (file)
@@ -6343,9 +6343,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;