Commit a799de0e authored by Lin Ma's avatar Lin Ma Committed by Jakub Kicinski
Browse files

net: nfc: remove inappropriate attrs check 



Revert "NFC: fix attrs checks in netlink interface"
This reverts commit 18917d51.

Our checks found weird attrs present check in function
nfc_genl_dep_link_down() and nfc_genl_llc_get_params(), which are
introduced by commit 18917d51 ("NFC: fix attrs checks in netlink
interface").

According to its message, it should add checks for functions
nfc_genl_deactivate_target() and nfc_genl_fw_download(). However, it
didn't do that. In fact, the expected checks are added by
(1) commit 385097a3 ("nfc: Ensure presence of required attributes in
the deactivate_target handler") and
(2) commit 280e3ebd ("nfc: Ensure presence of NFC_ATTR_FIRMWARE_NAME
attribute in nfc_genl_fw_download()"). Perhaps something went wrong.

Anyway, the attr NFC_ATTR_TARGET_INDEX is never accessed in callback
nfc_genl_dep_link_down() and same for NFC_ATTR_FIRMWARE_NAME and
nfc_genl_llc_get_params(). Thus, remove those checks.

Signed-off-by: default avatarLin Ma <linma@zju.edu.cn>
Link: https://lore.kernel.org/r/20240410034846.167421-1-linma@zju.edu.cn


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fbae0fa9

net/nfc/netlink.c

+2 −4
Original line number Diff line number Diff line
@@ -969,8 +969,7 @@ 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] ||

	    !info->attrs[NFC_ATTR_TARGET_INDEX])

	if (!info->attrs[NFC_ATTR_DEVICE_INDEX])

		return -EINVAL;



	idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);
@@ -1018,8 +1017,7 @@ 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] ||

	    !info->attrs[NFC_ATTR_FIRMWARE_NAME])

	if (!info->attrs[NFC_ATTR_DEVICE_INDEX])

		return -EINVAL;



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