Unverified Commit c18ce060 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5191 [sync] PR-5164: nfc: nci: assert requested protocol is valid 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/5164 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3N7CJUV4HFIXMVBC6JGF67VPQMMPF5UU/ 
 
https://gitee.com/src-openeuler/kernel/issues/I95B1K 
 
Link:https://gitee.com/openeuler/kernel/pulls/5191

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents b2f3ba69 8fda4913

net/nfc/nci/core.c

+5 −0
Original line number Diff line number Diff line
@@ -894,6 +894,11 @@ static int nci_activate_target(struct nfc_dev *nfc_dev, 
		return -EINVAL;

	}



	if (protocol >= NFC_PROTO_MAX) {

		pr_err("the requested nfc protocol is invalid\n");

		return -EINVAL;

	}



	if (!(nci_target->supported_protocols & (1 << protocol))) {

		pr_err("target does not support the requested protocol 0x%x\n",

		       protocol);