2022-01-24 16:03:18

by Hangyu Hua

Subject: [PATCH] yam: fix a memory leak in yam_siocdevprivate()

ym needs to be free when ym->cmd != SIOCYAMSMCS.

Fixes: 0781168e23a2 ("yam: fix a missing-check bug")
Signed-off-by: Hangyu Hua <[email protected]>
---
drivers/net/hamradio/yam.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 6376b8485976..980f2be32f05 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -950,9 +950,7 @@ static int yam_siocdevprivate(struct net_device *dev, struct ifreq *ifr, void __
ym = memdup_user(data, sizeof(struct yamdrv_ioctl_mcs));
if (IS_ERR(ym))
return PTR_ERR(ym);
- if (ym->cmd != SIOCYAMSMCS)
- return -EINVAL;
- if (ym->bitrate > YAM_MAXBITRATE) {
+ if (ym->cmd != SIOCYAMSMCS || ym->bitrate > YAM_MAXBITRATE) {
kfree(ym);
return -EINVAL;
}
--
2.25.1

2022-01-26 01:19:58

by patchwork-bot+netdevbpf

Subject: Re: [PATCH] yam: fix a memory leak in yam_siocdevprivate()

Hello:

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

On Mon, 24 Jan 2022 11:29:54 +0800 you wrote:
> ym needs to be free when ym->cmd != SIOCYAMSMCS.
>
> Fixes: 0781168e23a2 ("yam: fix a missing-check bug")
> Signed-off-by: Hangyu Hua <[email protected]>
> ---
> drivers/net/hamradio/yam.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)

Here is the summary with links:
- yam: fix a memory leak in yam_siocdevprivate()
https://git.kernel.org/netdev/net/c/29eb31542787

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

2022-01-27 11:36:27

by Thomas Osterried

Subject: Re: [PATCH] yam: fix a memory leak in yam_siocdevprivate()

Just a comment: Looks ok for me.

On Mon, Jan 24, 2022 at 11:29:54AM +0800, Hangyu Hua wrote:
> ym needs to be free when ym->cmd != SIOCYAMSMCS.
>
> Fixes: 0781168e23a2 ("yam: fix a missing-check bug")
> Signed-off-by: Hangyu Hua <[email protected]>
> ---
> drivers/net/hamradio/yam.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
> index 6376b8485976..980f2be32f05 100644
> --- a/drivers/net/hamradio/yam.c
> +++ b/drivers/net/hamradio/yam.c
> @@ -950,9 +950,7 @@ static int yam_siocdevprivate(struct net_device *dev, struct ifreq *ifr, void __
> ym = memdup_user(data, sizeof(struct yamdrv_ioctl_mcs));
> if (IS_ERR(ym))
> return PTR_ERR(ym);
> - if (ym->cmd != SIOCYAMSMCS)
> - return -EINVAL;
> - if (ym->bitrate > YAM_MAXBITRATE) {
> + if (ym->cmd != SIOCYAMSMCS || ym->bitrate > YAM_MAXBITRATE) {
> kfree(ym);
> return -EINVAL;
> }
> --
> 2.25.1
>