Commit 385097a3 authored Jun 14, 2019 by Young Xiao Committed by David S. Miller Jun 14, 2019

nfc: Ensure presence of required attributes in the deactivate_target handler



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: Young Xiao <92siuyang@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent b8003cef

net/nfc/netlink.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -911,7 +911,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]);

Admin message