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

Commit 4bb4ba36 authored by Young Xiao's avatar Young Xiao Committed by Greg Kroah-Hartman
Browse files

nfc: Ensure presence of required attributes in the deactivate_target handler 



[ Upstream commit 385097a3675749cbc9e97c085c0e5dfe4269ca51 ]

Check that the NFC_ATTR_TARGET_INDEX attributes (in addition to
NFC_ATTR_DEVICE_INDEX) are provided by the netlink client prior to
accessing them. This prevents potential unhandled NULL pointer dereference
exceptions which can be triggered by malicious user-mode programs,
if they omit one or both of these attributes.

Signed-off-by: default avatarYoung Xiao <92siuyang@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7530c3f3

net/nfc/netlink.c

+2 −1
Original line number Diff line number Diff line
@@ -922,7 +922,8 @@ static int nfc_genl_deactivate_target(struct sk_buff *skb, 
	u32 device_idx, target_idx;

	int rc;



	if (!info->attrs[NFC_ATTR_DEVICE_INDEX])

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

	    !info->attrs[NFC_ATTR_TARGET_INDEX])

		return -EINVAL;



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