Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f30060ef authored by Shang XiaoJing's avatar Shang XiaoJing Committed by Greg Kroah-Hartman
Browse files

nfc: nfcmrvl: Fix potential memory leak in nfcmrvl_i2c_nci_send() 



[ Upstream commit 93d904a734a74c54d945a9884b4962977f1176cd ]

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: b5b3e23e ("NFC: nfcmrvl: add i2c driver")
Signed-off-by: default avatarShang XiaoJing <shangxiaojing@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent aef89b91

drivers/nfc/nfcmrvl/i2c.c

+6 −1
Original line number Diff line number Diff line
@@ -151,12 +151,17 @@ static int nfcmrvl_i2c_nci_send(struct nfcmrvl_private *priv, 
			ret = -EREMOTEIO;

		} else

			ret = 0;

		kfree_skb(skb);

	}



	if (ret) {

		kfree_skb(skb);

		return ret;

	}



	consume_skb(skb);

	return 0;

}



static void nfcmrvl_i2c_nci_update_config(struct nfcmrvl_private *priv,

					  const void *param)

{