]>
Commit | Line | Data |
---|---|---|
dcd32332 SL |
1 | From 10a24ff36c9d74998d396b864a00e5293e90b53d Mon Sep 17 00:00:00 2001 |
2 | From: Aditya Pakki <pakki001@umn.edu> | |
3 | Date: Thu, 14 Mar 2019 15:31:40 -0500 | |
4 | Subject: qlcnic: Avoid potential NULL pointer dereference | |
5 | ||
6 | [ Upstream commit 5bf7295fe34a5251b1d241b9736af4697b590670 ] | |
7 | ||
8 | netdev_alloc_skb can fail and return a NULL pointer which is | |
9 | dereferenced without a check. The patch avoids such a scenario. | |
10 | ||
11 | Signed-off-by: Aditya Pakki <pakki001@umn.edu> | |
12 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
13 | Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org> | |
14 | --- | |
15 | drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 2 ++ | |
16 | 1 file changed, 2 insertions(+) | |
17 | ||
18 | diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | |
19 | index 0a2318cad34d..63ebc491057b 100644 | |
20 | --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | |
21 | +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | |
22 | @@ -1038,6 +1038,8 @@ int qlcnic_do_lb_test(struct qlcnic_adapter *adapter, u8 mode) | |
23 | ||
24 | for (i = 0; i < QLCNIC_NUM_ILB_PKT; i++) { | |
25 | skb = netdev_alloc_skb(adapter->netdev, QLCNIC_ILB_PKT_SIZE); | |
26 | + if (!skb) | |
27 | + break; | |
28 | qlcnic_create_loopback_buff(skb->data, adapter->mac_addr); | |
29 | skb_put(skb, QLCNIC_ILB_PKT_SIZE); | |
30 | adapter->ahw->diag_cnt = 0; | |
31 | -- | |
32 | 2.19.1 | |
33 |