From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:58334 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754985AbdGVNND (ORCPT ); Sat, 22 Jul 2017 09:13:03 -0400 Subject: Patch "nfc: Ensure presence of required attributes in the activate_target handler" has been added to the 3.18-stable tree To: mjurczyk@google.com, gregkh@linuxfoundation.org, keescook@chromium.org, sameo@linux.intel.com Cc: , From: Date: Sat, 22 Jul 2017 15:02:06 +0200 Message-ID: <150072852622678@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled nfc: Ensure presence of required attributes in the activate_target handler to the 3.18-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: nfc-ensure-presence-of-required-attributes-in-the-activate_target-handler.patch and it can be found in the queue-3.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From a0323b979f81ad2deb2c8836eab506534891876a Mon Sep 17 00:00:00 2001 From: Mateusz Jurczyk Date: Wed, 24 May 2017 12:42:26 +0200 Subject: nfc: Ensure presence of required attributes in the activate_target handler From: Mateusz Jurczyk 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 Acked-by: Kees Cook Signed-off-by: Samuel Ortiz Signed-off-by: Greg Kroah-Hartman --- net/nfc/netlink.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c @@ -899,7 +899,9 @@ static int nfc_genl_llc_get_params(struc 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]); Patches currently in stable-queue which might be from mjurczyk@google.com are queue-3.18/nfc-add-sockaddr-length-checks-before-accessing-sa_family-in-bind-handlers.patch queue-3.18/nfc-ensure-presence-of-required-attributes-in-the-activate_target-handler.patch queue-3.18/nfc-fix-the-sockaddr-length-sanitization-in-llcp_sock_connect.patch