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: Kees Cook <keescook@chromium.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 31784e3..962826d 100644 (file)
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -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;