diff options
| author | Jeremy Cline <jeremy@jcline.org> | 2023-10-09 22:00:54 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-10-12 09:32:10 +0200 |
| commit | 354a6e707e29cb0c007176ee5b8db8be7bd2dee0 (patch) | |
| tree | db32a5ec815d25769e27055f0c6400a18405b080 /net/nfc/nci | |
| parent | af_packet: Fix fortified memcpy() without flex array. (diff) | |
| download | linux-354a6e707e29cb0c007176ee5b8db8be7bd2dee0.tar.xz linux-354a6e707e29cb0c007176ee5b8db8be7bd2dee0.zip | |
nfc: nci: assert requested protocol is valid
The protocol is used in a bit mask to determine if the protocol is
supported. Assert the provided protocol is less than the maximum
defined so it doesn't potentially perform a shift-out-of-bounds and
provide a clearer error for undefined protocols vs unsupported ones.
Fixes: 6a2968aaf50c ("NFC: basic NCI protocol implementation")
Reported-and-tested-by: syzbot+0839b78e119aae1fec78@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=0839b78e119aae1fec78
Signed-off-by: Jeremy Cline <jeremy@jcline.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20231009200054.82557-1-jeremy@jcline.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/nfc/nci')
| -rw-r--r-- | net/nfc/nci/core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index fff755dde30d..6c9592d05120 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c @@ -909,6 +909,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); |