diff mbox series

[5.4,57/64] yam: fix a memory leak in yam_siocdevprivate()

Message ID	20220131105217.601561681@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Hangyu Hua <hbh25y@gmail.com>, "David S. Miller" <davem@davemloft.net>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.4 57/64] yam: fix a memory leak in yam_siocdevprivate() Date: Mon, 31 Jan 2022 11:56:42 +0100 Message-Id: <20220131105217.601561681@linuxfoundation.org> In-Reply-To: <20220131105215.644174521@linuxfoundation.org> References: <20220131105215.644174521@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.4,03/64] scsi: zfcp: Fix failed recovery on gone remote port with non-NPIV FCP devices [5.4,04/64] udf: Restore i_lenAlloc when inode expansion fails [5.4,05/64] udf: Fix NULL ptr deref when converting from inline format [5.4,11/64] arm64: errata: Fix exec handling in erratum 1418040 workaround [5.4,13/64] serial: 8250: of: Fix mapped region size when using reg-offset property [5.4,14/64] serial: stm32: fix software flow control transfer [5.4,18/64] usb: common: ulpi: Fix crash in ulpi_match() [5.4,19/64] usb: gadget: f_sourcesink: Fix isoc transfer for USB_SPEED_SUPER_PLUS [5.4,20/64] USB: core: Fix hang in usb_kill_urb by adding memory barriers [5.4,22/64] ucsi_ccg: Check DEV_INT bit only when starting CCG4 [5.4,26/64] i40e: Fix issue when maximum queues is exceeded [5.4,28/64] i40e: fix unsigned stat widths [5.4,30/64] rpmsg: char: Fix race between the release of rpmsg_eptdev and cdev [5.4,31/64] scsi: bnx2fc: Flush destroy_work queue before calling bnx2fc_interface_put() [5.4,32/64] ipv6_tunnel: Rate limit warning messages [5.4,33/64] ARM: 9170/1: fix panic when kasan and kprobe are enabled [5.4,35/64] hwmon: (lm90) Mark alert as broken for MAX6646/6647/6649 [5.4,39/64] hwmon: (lm90) Reduce maximum conversion rate for G781 [5.4,45/64] drm/msm/dsi: invalid parameter check in msm_dsi_phy_enable [5.4,47/64] NFS: Ensure the server has an up to date ctime before hardlinking [5.4,49/64] netfilter: conntrack: dont increment invalid counter on NF_REPEAT [5.4,50/64] net: phy: broadcom: hook up soft_reset for BCM54616S [5.4,52/64] rxrpc: Adjust retransmission backoff [5.4,55/64] ibmvnic: dont spin in tasklet [5.4,57/64] yam: fix a memory leak in yam_siocdevprivate() [5.4,58/64] net: hns3: handle empty unknown interrupt for VF [5.4,60/64] ipv4: tcp: send zero IPID in SYNACK messages [5.4,61/64] ipv4: remove sparse error in ip_neigh_gw4() [5.4,63/64] fsnotify: invalidate dcache before IN_DELETE event [5.4,64/64] block: Fix wrong offset in bio_truncate()

Commit Message

Greg KH Jan. 31, 2022, 10:56 a.m. UTC

From: Hangyu Hua <hbh25y@gmail.com>

[ Upstream commit 29eb31542787e1019208a2e1047bb7c76c069536 ]

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

Fixes: 0781168e23a2 ("yam: fix a missing-check bug")
Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/hamradio/yam.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 5ab53e9942f30..5d30b3e1806ab 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -951,9 +951,7 @@  static int yam_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 				 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;
 		}