public inbox for linux-usb@vger.kernel.org
 help / color / mirror / Atom feed
From: Andrew Lunn <andrew@lunn.ch>
To: Kees Cook <keescook@chromium.org>
Cc: netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>,
	Hayes Wang <hayeswang@realtek.com>,
	Lee Jones <lee.jones@linaro.org>, EJ Hsu <ejh@nvidia.com>,
	linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
	linux-hardening@vger.kernel.org
Subject: Re: [PATCH] r8152: Avoid memcpy() over-reading of ETH_SS_STATS
Date: Wed, 16 Jun 2021 22:02:43 +0200	[thread overview]
Message-ID: <YMpY49PLAyObVxC4@lunn.ch> (raw)
In-Reply-To: <20210616195303.1231429-1-keescook@chromium.org>

On Wed, Jun 16, 2021 at 12:53:03PM -0700, Kees Cook 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 array fields.
> 
> The memcpy() is copying the entire structure, not just the first array.
> Adjust the source argument so the compiler can do appropriate bounds
> checking.
> 
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
>  drivers/net/usb/r8152.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
> index 85039e17f4cd..5f08720bf1c9 100644
> --- a/drivers/net/usb/r8152.c
> +++ b/drivers/net/usb/r8152.c
> @@ -8678,7 +8678,7 @@ static void rtl8152_get_strings(struct net_device *dev, u32 stringset, u8 *data)
>  {
>  	switch (stringset) {
>  	case ETH_SS_STATS:
> -		memcpy(data, *rtl8152_gstrings, sizeof(rtl8152_gstrings));
> +		memcpy(data, rtl8152_gstrings, sizeof(rtl8152_gstrings));
>  		break;

Is this correct? The call is supposed to return all the statistic
strings, which would be the entire structure.

	  Andrew

  reply	other threads:[~2021-06-16 20:02 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-16 19:53 [PATCH] r8152: Avoid memcpy() over-reading of ETH_SS_STATS Kees Cook
2021-06-16 20:02 ` Andrew Lunn [this message]
2021-06-16 20:10   ` Andrew Lunn
2021-06-17  3:20     ` Kees Cook
2021-06-16 20:10 ` patchwork-bot+netdevbpf

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=YMpY49PLAyObVxC4@lunn.ch \
    --to=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=ejh@nvidia.com \
    --cc=hayeswang@realtek.com \
    --cc=keescook@chromium.org \
    --cc=kuba@kernel.org \
    --cc=lee.jones@linaro.org \
    --cc=linux-hardening@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /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