Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4bf53b51 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

cifs: silence compiler warnings showing up with gcc-8.0.0 



[ 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: b2a3ad9c ("cifs: silence compiler warnings showing up with gcc-4.7.0")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e0a1a017

fs/cifs/cifssmb.c

+1 −3
Original line number Diff line number Diff line
@@ -6413,9 +6413,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;