From: Steve French <smfrench@gmail.com>
To: Kees Cook <keescook@chromium.org>
Cc: Steve French <stfrench@microsoft.com>,
LKML <linux-kernel@vger.kernel.org>,
CIFS <linux-cifs@vger.kernel.org>,
samba-technical <samba-technical@lists.samba.org>,
linux-hardening@vger.kernel.org
Subject: Re: [PATCH] cifs: Avoid field over-reading memcpy()
Date: Mon, 21 Jun 2021 21:40:16 -0500 [thread overview]
Message-ID: <CAH2r5msjg34KP4OxSwJTHmwawkFBW1k6-EUb4G_Ac4anC9TOgA@mail.gmail.com> (raw)
In-Reply-To: <20210621214446.1406159-1-keescook@chromium.org>
merged into cifs-2.6.git for-next
On Mon, Jun 21, 2021 at 4:45 PM Kees Cook <keescook@chromium.org> wrote:
>
> 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>
> ---
> fs/cifs/smb2pdu.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
> index 31784e3fa96f..962826dc3316 100644
> --- 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;
> --
> 2.30.2
>
--
Thanks,
Steve
prev parent reply other threads:[~2021-06-22 2:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-21 21:44 [PATCH] cifs: Avoid field over-reading memcpy() Kees Cook
2021-06-22 2:40 ` Steve French [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAH2r5msjg34KP4OxSwJTHmwawkFBW1k6-EUb4G_Ac4anC9TOgA@mail.gmail.com \
--to=smfrench@gmail.com \
--cc=keescook@chromium.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=samba-technical@lists.samba.org \
--cc=stfrench@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).