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

Commit c8a65ec0 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Greg Kroah-Hartman
Browse files

NFC: fix attrs checks in netlink interface 



commit 18917d51472fe3b126a3a8f756c6b18085eb8130 upstream.

nfc_genl_deactivate_target() relies on the NFC_ATTR_TARGET_INDEX
attribute being present, but doesn't check whether it is actually
provided by the user. Same goes for nfc_genl_fw_download() and
NFC_ATTR_FIRMWARE_NAME.

This patch adds appropriate checks.

Found with syzkaller.

Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1b425032

net/nfc/netlink.c

+4 −2
Original line number Diff line number Diff line
@@ -981,7 +981,8 @@ static int nfc_genl_dep_link_down(struct sk_buff *skb, struct genl_info *info) 
	int rc;

	u32 idx;



	if (!info->attrs[NFC_ATTR_DEVICE_INDEX])

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

	    !info->attrs[NFC_ATTR_TARGET_INDEX])

		return -EINVAL;



	idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
@@ -1029,7 +1030,8 @@ static int nfc_genl_llc_get_params(struct sk_buff *skb, struct genl_info *info) 
	struct sk_buff *msg = NULL;

	u32 idx;



	if (!info->attrs[NFC_ATTR_DEVICE_INDEX])

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

	    !info->attrs[NFC_ATTR_FIRMWARE_NAME])

		return -EINVAL;



	idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);