[PATCH 1/1] mt7601u: check return value of alloc_skb

Path	csiph.com!feeder.erje.net!2.eu.feeder.erje.net!news.in-chemnitz.de!news2.arglkargh.de!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Pan Bian <bianpan2016@163.com>
Newsgroups	linux.kernel
Subject	[PATCH 1/1] mt7601u: check return value of alloc_skb
Date	Sun, 23 Apr 2017 09:10:02 +0200
Message-ID	<tzjOG-5m6-5@gated-at.bofh.it> (permalink)
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=pqCNtvF6nCB8tt9X4n W0sN+I3PPb5++TxD3MGsF71UM=; b=VL8suIiaFi9IJTUjcQPhFcoggXoGSz7hCD LEBXR512tmZkw+Xgpo826fFdwO3KGPDeUT8jUMhqHZDnsisTsIR6ZuxCK4Bm4dqO FK0+ddxuJvPAH9iHjICq2M+OjC9zu/VcGrLU1BrHxEPLsXqqv1G4uwddHx0RuoIb 6fzgcGFRA=
X-Mailer	git-send-email 1.9.1
X-Cm-Transid	DdGowAD3GogHUfxYUzQWAA--.300S3
X-Coremail-Antispam	1Uf129KBjvJXoW7KFy7WF4ruF48XF45GF15Jwb_yoW8Wr1UpF WUKayjk3W8Xr4jqw1xAw1rAr15Cw1Fqa1agF9Iqw4DZ3s8JrnYqa4UtF12q3WfAFZ7CF13 tF1UKF43urW5Z3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UKApOUUUUU=
X-Originating-IP	[123.118.194.153]
X-Cm-Senderinfo	held01tdqsiiqw6rljoofrz/xtbBzwrCclaDt5ePPAAAsz
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	46
Organization	linux.* mail to news gateway
X-Original-Cc	linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Pan Bian <bianpan2016@163.com>
X-Original-Date	Sun, 23 Apr 2017 15:00:23 +0800
X-Original-Message-ID	<1492930823-17249-1-git-send-email-bianpan2016@163.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1628916

Show key headers only | View raw

Function alloc_skb() will return a NULL pointer if there is no enough
memory. However, in function mt7601u_mcu_msg_alloc(), its return value
is not validated before it is used. This patch fixes it.

Signed-off-by: Pan Bian <bianpan2016@163.com>
---
 drivers/net/wireless/mediatek/mt7601u/mcu.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/mediatek/mt7601u/mcu.c b/drivers/net/wireless/mediatek/mt7601u/mcu.c
index dbdfb3f..a9f5f39 100644
--- a/drivers/net/wireless/mediatek/mt7601u/mcu.c
+++ b/drivers/net/wireless/mediatek/mt7601u/mcu.c
@@ -66,8 +66,10 @@ static inline void trace_mt_mcu_msg_send_cs(struct mt7601u_dev *dev,
 	WARN_ON(len % 4); /* if length is not divisible by 4 we need to pad */
 
 	skb = alloc_skb(len + MT_DMA_HDR_LEN + 4, GFP_KERNEL);
-	skb_reserve(skb, MT_DMA_HDR_LEN);
-	memcpy(skb_put(skb, len), data, len);
+	if (skb) {
+		skb_reserve(skb, MT_DMA_HDR_LEN);
+		memcpy(skb_put(skb, len), data, len);
+	}
 
 	return skb;
 }
@@ -170,6 +172,8 @@ static int mt7601u_mcu_function_select(struct mt7601u_dev *dev,
 	};
 
 	skb = mt7601u_mcu_msg_alloc(dev, &msg, sizeof(msg));
+	if (!skb)
+		return -ENOMEM;
 	return mt7601u_mcu_msg_send(dev, skb, CMD_FUN_SET_OP, func == 5);
 }
 
@@ -205,6 +209,8 @@ int mt7601u_mcu_tssi_read_kick(struct mt7601u_dev *dev, int use_hvga)
 	};
 
 	skb = mt7601u_mcu_msg_alloc(dev, &msg, sizeof(msg));
+	if (!skb)
+		return -ENOMEM;
 	return mt7601u_mcu_msg_send(dev, skb, CMD_CALIBRATION_OP, true);
 }
 
-- 
1.9.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/1] mt7601u: check return value of alloc_skb Pan Bian <bianpan2016@163.com> - 2017-04-23 09:10 +0200
  Re: [PATCH 1/1] mt7601u: check return value of alloc_skb Jakub Kicinski <kubakici@wp.pl> - 2017-04-24 06:00 +0200

csiph-web