diff options
| author | Mateusz Jurczyk <mjurczyk@google.com> | 2017-05-24 12:42:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-27 15:06:03 -0700 |
| commit | ecb7abed0be9e5ced334ccd76e809cd34a00e23c (patch) | |
| tree | 90e9160ccba0a31df12922865e4f87cd577fb11e /net/nfc | |
| parent | b57a72d5aaf861774243724bdce7726c612d57bf (diff) | |
| download | linux-stable-ecb7abed0be9e5ced334ccd76e809cd34a00e23c.tar.gz linux-stable-ecb7abed0be9e5ced334ccd76e809cd34a00e23c.tar.bz2 linux-stable-ecb7abed0be9e5ced334ccd76e809cd34a00e23c.zip | |
nfc: Ensure presence of required attributes in the activate_target handler
commit a0323b979f81ad2deb2c8836eab506534891876a upstream.
Check that the NFC_ATTR_TARGET_INDEX and NFC_ATTR_PROTOCOLS 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: Mateusz Jurczyk <mjurczyk@google.com>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/netlink.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c index f58c1fba1026..12dfb457275d 100644 --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c @@ -873,7 +873,9 @@ static int nfc_genl_activate_target(struct sk_buff *skb, struct genl_info *info) u32 device_idx, target_idx, protocol; int rc; - if (!info->attrs[NFC_ATTR_DEVICE_INDEX]) + if (!info->attrs[NFC_ATTR_DEVICE_INDEX] || + !info->attrs[NFC_ATTR_TARGET_INDEX] || + !info->attrs[NFC_ATTR_PROTOCOLS]) return -EINVAL; device_idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]); |