2023-10-21 18:04:22

by Christophe JAILLET

Subject: [PATCH net] net: ieee802154: adf7242: Fix some potential buffer overflow in adf7242_stats_show()

strncat() usage in adf7242_debugfs_init() is wrong.
The size given to strncat() is the maximum number of bytes that can be
written, excluding the trailing NULL.

Here, the size that is passed, DNAME_INLINE_LEN, does not take into account
the size of "adf7242-" that is already in the array.

In order to fix it, use snprintf() instead.

Fixes: 7302b9d90117 ("ieee802154/adf7242: Driver for ADF7242 MAC IEEE802154")
Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/net/ieee802154/adf7242.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c
index a03490ba2e5b..cc7ddc40020f 100644
--- a/drivers/net/ieee802154/adf7242.c
+++ b/drivers/net/ieee802154/adf7242.c
@@ -1162,9 +1162,10 @@ static int adf7242_stats_show(struct seq_file *file, void *offset)

static void adf7242_debugfs_init(struct adf7242_local *lp)
{
- char debugfs_dir_name[DNAME_INLINE_LEN + 1] = "adf7242-";
+ char debugfs_dir_name[DNAME_INLINE_LEN + 1];

- strncat(debugfs_dir_name, dev_name(&lp->spi->dev), DNAME_INLINE_LEN);
+ snprintf(debugfs_dir_name, sizeof(debugfs_dir_name),
+ "adf7242-%s", dev_name(&lp->spi->dev));

lp->debugfs_root = debugfs_create_dir(debugfs_dir_name, NULL);

--
2.34.1

2023-10-22 10:31:40

by patchwork-bot+netdevbpf

Subject: Re: [PATCH net] net: ieee802154: adf7242: Fix some potential buffer overflow in adf7242_stats_show()

Hello:

This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:

On Sat, 21 Oct 2023 20:03:53 +0200 you wrote:
> strncat() usage in adf7242_debugfs_init() is wrong.
> The size given to strncat() is the maximum number of bytes that can be
> written, excluding the trailing NULL.
>
> Here, the size that is passed, DNAME_INLINE_LEN, does not take into account
> the size of "adf7242-" that is already in the array.
>
> [...]

Here is the summary with links:
- [net] net: ieee802154: adf7242: Fix some potential buffer overflow in adf7242_stats_show()
https://git.kernel.org/netdev/net/c/ca082f019d8f

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

2023-10-23 06:27:45

by Hennerich, Michael

Subject: RE: [PATCH net] net: ieee802154: adf7242: Fix some potential buffer overflow in adf7242_stats_show()

> -----Original Message-----
> From: Christophe JAILLET <[email protected]>
> Sent: Samstag, 21. Oktober 2023 20:04
> To: [email protected]; Hennerich, Michael
> <[email protected]>; Alexander Aring <[email protected]>;
> Stefan Schmidt <[email protected]>; Miquel Raynal
> <[email protected]>; David S. Miller <[email protected]>; Eric
> Dumazet <[email protected]>; Jakub Kicinski <[email protected]>; Paolo
> Abeni <[email protected]>; Marcel Holtmann <[email protected]>
> Cc: [email protected]; [email protected]; kernel-
> [email protected]; Christophe JAILLET <[email protected]>;
> Stefan Schmidt <[email protected]>; [email protected];
> [email protected]
> Subject: [PATCH net] net: ieee802154: adf7242: Fix some potential buffer
> overflow in adf7242_stats_show()
>
>
> strncat() usage in adf7242_debugfs_init() is wrong.
> The size given to strncat() is the maximum number of bytes that can be written,
> excluding the trailing NULL.
>
> Here, the size that is passed, DNAME_INLINE_LEN, does not take into account
> the size of "adf7242-" that is already in the array.
>
> In order to fix it, use snprintf() instead.
>
> Fixes: 7302b9d90117 ("ieee802154/adf7242: Driver for ADF7242 MAC
> IEEE802154")
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---

Acked-by: Michael Hennerich <[email protected]>

> drivers/net/ieee802154/adf7242.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ieee802154/adf7242.c
> b/drivers/net/ieee802154/adf7242.c
> index a03490ba2e5b..cc7ddc40020f 100644
> --- a/drivers/net/ieee802154/adf7242.c
> +++ b/drivers/net/ieee802154/adf7242.c
> @@ -1162,9 +1162,10 @@ static int adf7242_stats_show(struct seq_file *file,
> void *offset)
>
> static void adf7242_debugfs_init(struct adf7242_local *lp) {
> - char debugfs_dir_name[DNAME_INLINE_LEN + 1] = "adf7242-";
> + char debugfs_dir_name[DNAME_INLINE_LEN + 1];
>
> - strncat(debugfs_dir_name, dev_name(&lp->spi->dev),
> DNAME_INLINE_LEN);
> + snprintf(debugfs_dir_name, sizeof(debugfs_dir_name),
> + "adf7242-%s", dev_name(&lp->spi->dev));
>
> lp->debugfs_root = debugfs_create_dir(debugfs_dir_name, NULL);
>
> --
> 2.34.1