From: Simon Horman <horms@kernel.org>
To: Gal Pressman <gal@nvidia.com>
Cc: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
netdev@vger.kernel.org, Vlad Buslov <vladbu@nvidia.com>
Subject: Re: [PATCH net] net: Fix undefined behavior in netdev name allocation
Date: Mon, 13 Nov 2023 09:53:33 +0000 [thread overview]
Message-ID: <20231113095333.GM705326@kernel.org> (raw)
In-Reply-To: <20231113083544.1685919-1-gal@nvidia.com>
On Mon, Nov 13, 2023 at 10:35:44AM +0200, Gal Pressman wrote:
> Cited commit removed the strscpy() call and kept the snprintf() only.
>
> When allocating a netdev, 'res' and 'name' pointers are equal, but
> according to POSIX, if copying takes place between objects that overlap
> as a result of a call to sprintf() or snprintf(), the results are
> undefined.
>
> Add back the strscpy() and use 'buf' as an intermediate buffer.
>
> Fixes: 9a810468126c ("net: reduce indentation of __dev_alloc_name()")
Hi Gal,
perhaps my eyes are deceiving me, but I wonder if this fixes the following:
7ad17b04dc7b ("net: trust the bitmap in __dev_alloc_name()")
> Cc: Jakub Kicinski <kuba@kernel.org>
> Reviewed-by: Vlad Buslov <vladbu@nvidia.com>
> Signed-off-by: Gal Pressman <gal@nvidia.com>
> ---
> net/core/dev.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 0d548431f3fa..af53f6d838ce 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -1119,7 +1119,9 @@ static int __dev_alloc_name(struct net *net, const char *name, char *res)
> if (i == max_netdevices)
> return -ENFILE;
>
> - snprintf(res, IFNAMSIZ, name, i);
> + /* 'res' and 'name' could overlap, use 'buf' as an intermediate buffer */
> + strscpy(buf, name, IFNAMSIZ);
> + snprintf(res, IFNAMSIZ, buf, i);
> return i;
> }
>
> --
> 2.40.1
>
>
next prev parent reply other threads:[~2023-11-13 9:53 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-13 8:35 [PATCH net] net: Fix undefined behavior in netdev name allocation Gal Pressman
2023-11-13 9:53 ` Simon Horman [this message]
2023-11-13 14:01 ` Gal Pressman
2023-11-15 9:28 ` Simon Horman
2023-11-14 4:09 ` Jakub Kicinski
2023-11-14 4:12 ` Jakub Kicinski
2023-11-14 7:26 ` Gal Pressman
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=20231113095333.GM705326@kernel.org \
--to=horms@kernel.org \
--cc=davem@davemloft.net \
--cc=gal@nvidia.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=vladbu@nvidia.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).