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

Commit d1d912e7 authored by Miaoqian Lin's avatar Miaoqian Lin Committed by Greg Kroah-Hartman
Browse files

nfc: Fix potential resource leaks 



[ Upstream commit df49908f3c52d211aea5e2a14a93bbe67a2cb3af ]

nfc_get_device() take reference for the device, add missing
nfc_put_device() to release it when not need anymore.
Also fix the style warnning by use error EOPNOTSUPP instead of
ENOTSUPP.

Fixes: 5ce3f32b ("NFC: netlink: SE API implementation")
Fixes: 29e76924 ("nfc: netlink: Add capability to reply to vendor_cmd with data")
Signed-off-by: default avatarMiaoqian Lin <linmq006@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d12a7510

net/nfc/netlink.c

+38 −14
Original line number Diff line number Diff line
@@ -1515,6 +1515,7 @@ static int nfc_genl_se_io(struct sk_buff *skb, struct genl_info *info) 
	u32 dev_idx, se_idx;

	u8 *apdu;

	size_t apdu_len;

	int rc;



	if (!info->attrs[NFC_ATTR_DEVICE_INDEX] ||

	    !info->attrs[NFC_ATTR_SE_INDEX] ||
@@ -1528,25 +1529,37 @@ static int nfc_genl_se_io(struct sk_buff *skb, struct genl_info *info) 
	if (!dev)

		return -ENODEV;



	if (!dev->ops || !dev->ops->se_io)

		return -ENOTSUPP;

	if (!dev->ops || !dev->ops->se_io) {

		rc = -EOPNOTSUPP;

		goto put_dev;

	}



	apdu_len = nla_len(info->attrs[NFC_ATTR_SE_APDU]);

	if (apdu_len == 0)

		return -EINVAL;

	if (apdu_len == 0) {

		rc = -EINVAL;

		goto put_dev;

	}



	apdu = nla_data(info->attrs[NFC_ATTR_SE_APDU]);

	if (!apdu)

		return -EINVAL;

	if (!apdu) {

		rc = -EINVAL;

		goto put_dev;

	}



	ctx = kzalloc(sizeof(struct se_io_ctx), GFP_KERNEL);

	if (!ctx)

		return -ENOMEM;

	if (!ctx) {

		rc = -ENOMEM;

		goto put_dev;

	}



	ctx->dev_idx = dev_idx;

	ctx->se_idx = se_idx;



	return nfc_se_io(dev, se_idx, apdu, apdu_len, se_io_cb, ctx);

	rc = nfc_se_io(dev, se_idx, apdu, apdu_len, se_io_cb, ctx);



put_dev:

	nfc_put_device(dev);

	return rc;

}



static int nfc_genl_vendor_cmd(struct sk_buff *skb,
@@ -1569,14 +1582,21 @@ static int nfc_genl_vendor_cmd(struct sk_buff *skb, 
	subcmd = nla_get_u32(info->attrs[NFC_ATTR_VENDOR_SUBCMD]);



	dev = nfc_get_device(dev_idx);

	if (!dev || !dev->vendor_cmds || !dev->n_vendor_cmds)

	if (!dev)

		return -ENODEV;



	if (!dev->vendor_cmds || !dev->n_vendor_cmds) {

		err = -ENODEV;

		goto put_dev;

	}



	if (info->attrs[NFC_ATTR_VENDOR_DATA]) {

		data = nla_data(info->attrs[NFC_ATTR_VENDOR_DATA]);

		data_len = nla_len(info->attrs[NFC_ATTR_VENDOR_DATA]);

		if (data_len == 0)

			return -EINVAL;

		if (data_len == 0) {

			err = -EINVAL;

			goto put_dev;

		}

	} else {

		data = NULL;

		data_len = 0;
@@ -1591,10 +1611,14 @@ static int nfc_genl_vendor_cmd(struct sk_buff *skb, 
		dev->cur_cmd_info = info;

		err = cmd->doit(dev, data, data_len);

		dev->cur_cmd_info = NULL;

		return err;

		goto put_dev;

	}



	return -EOPNOTSUPP;

	err = -EOPNOTSUPP;



put_dev:

	nfc_put_device(dev);

	return err;

}



/* message building helper */