Skip to content

Commit

Permalink
nfc: nfcmrvl: Fix potential memory leak in nfcmrvl_i2c_nci_send()
Browse files Browse the repository at this point in the history
[ Upstream commit 93d904a ]

nfcmrvl_i2c_nci_send() will be called by nfcmrvl_nci_send(), and skb
should be freed in nfcmrvl_i2c_nci_send(). However, nfcmrvl_nci_send()
will only free skb when i2c_master_send() return >=0, which means skb
will memleak when i2c_master_send() failed. Free skb no matter whether
i2c_master_send() succeeds.

Fixes: b5b3e23 ("NFC: nfcmrvl: add i2c driver")
Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Shang XiaoJing authored and gregkh committed Nov 10, 2022
1 parent a53e9ef commit 92a1df9
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/nfc/nfcmrvl/i2c.c
Expand Up @@ -132,10 +132,15 @@ static int nfcmrvl_i2c_nci_send(struct nfcmrvl_private *priv,
ret = -EREMOTEIO;
} else
ret = 0;
}

if (ret) {
kfree_skb(skb);
return ret;
}

return ret;
consume_skb(skb);
return 0;
}

static void nfcmrvl_i2c_nci_update_config(struct nfcmrvl_private *priv,
Expand Down

0 comments on commit 92a1df9

Please sign in to comment.