Commit fbcff33d authored by Kees Cook's avatar Kees Cook Committed by Steve French
Browse files

cifs: Avoid field over-reading memcpy() 



In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memcpy(), memmove(), and memset(), avoid
intentionally reading across neighboring fields.

Instead of using memcpy to read across multiple struct members, just
perform per-member assignments as already done for other members.

Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent e0ae8a9a

fs/cifs/smb2pdu.c

+4 −1
Original line number Diff line number Diff line
@@ -2892,7 +2892,10 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path, 
#endif /* CIFS_DEBUG2 */



	if (buf) {

		memcpy(buf, &rsp->CreationTime, 32);

		buf->CreationTime = rsp->CreationTime;

		buf->LastAccessTime = rsp->LastAccessTime;

		buf->LastWriteTime = rsp->LastWriteTime;

		buf->ChangeTime = rsp->ChangeTime;

		buf->AllocationSize = rsp->AllocationSize;

		buf->EndOfFile = rsp->EndofFile;

		buf->Attributes = rsp->FileAttributes;