diff options
| author | Mateusz Jurczyk <mjurczyk@google.com> | 2017-05-24 12:42:26 +0200 |
|---|---|---|
| committer | GreekDragon <alextsanisbadlorg@gmail.com> | 2019-03-27 08:39:44 -0700 |
| commit | 3fddefaf385f3e8509a8313511537ae92f9ce7f8 (patch) | |
| tree | 9ea05df549ccbcf0d018e3f1f60e6420247172ca | |
| parent | f194ce010c77aa378c8863ed0c0d60272528798b (diff) | |
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>
| -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 532869d8bc3..d0a01ff7802 100644 --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c @@ -829,7 +829,9 @@ 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]) + if (!info->attrs[NFC_ATTR_DEVICE_INDEX] || + !info->attrs[NFC_ATTR_TARGET_INDEX] || + !info->attrs[NFC_ATTR_PROTOCOLS]) return -EINVAL; idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]); |