| Message ID | 20180202154902.1626750-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
merged into cifs-2.6.git for-next On Fri, Feb 2, 2018 at 9:48 AM, Arnd Bergmann <arnd@arndb.de> wrote: > 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> > --- > 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 72d71703f1e8..78bc86c315ec 100644 > --- a/fs/cifs/cifssmb.c > +++ b/fs/cifs/cifssmb.c > @@ -6343,9 +6343,7 @@ CIFSSMBSetEA(const unsigned int xid, struct cifs_tcon *tcon, > 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.9.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-cifs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 72d71703f1e8..78bc86c315ec 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -6343,9 +6343,7 @@ CIFSSMBSetEA(const unsigned int xid, struct cifs_tcon *tcon, 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;
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> --- fs/cifs/cifssmb.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)