From patchwork Wed May 24 10:42:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mateusz Jurczyk X-Patchwork-Id: 9745755 X-Patchwork-Delegate: sameo@linux.intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 499C5601C2 for ; Wed, 24 May 2017 10:42:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59A5428947 for ; Wed, 24 May 2017 10:42:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4C87A28950; Wed, 24 May 2017 10:42:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E62FF28947 for ; Wed, 24 May 2017 10:42:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S939592AbdEXKmi (ORCPT ); Wed, 24 May 2017 06:42:38 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:37469 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763408AbdEXKmb (ORCPT ); Wed, 24 May 2017 06:42:31 -0400 Received: by mail-wm0-f52.google.com with SMTP id d127so63105825wmf.0 for ; Wed, 24 May 2017 03:42:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=y/Z12mtwitnuSl/aU4Z3IOzcBl3/37IDtUNRAt+sisE=; b=G3XXEnkVOPBkd90lIBU8oV1ftXqajCzXFXaFcvtZIIEHcIA5pQ0kmczyoEn2akFjmq LuQQJ0I6GcYrro3RHIuUBlvfz8Pcviyy1dmCEsBsaQUyYByjd03OXAEa/2ZVg4OmSocP NzCoo1uX+wU51GYPz27R+QfJQxtV3PC/MK10BzAUtUkmrarmuIw9u8JzidCC8syAm7ps zEtagXsB3HARqxumco/pcpX9TQHA+2Wg0sOrioeSiZtuM9nGHO9hTK9us7hzQAIM8qp7 WdoCAm1yTdQ62mC/uKXsH621EHXTA5Ue4Kejpszts82TDjoryKVJOuIiBwPhH5PWVagP 71tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=y/Z12mtwitnuSl/aU4Z3IOzcBl3/37IDtUNRAt+sisE=; b=lzoefifg8sKVc0mUrmsVaaG9es48N8vGkgsZFzoT5VkxAi+oqloyDvvgtEDOiHo0mN 50A2ZwbQRmU6HB8XSwJSWotyl9rV6K/QKUj9/skiv9QSH5I8Okfoazx2n6EFC6BDOV3O itNjNlA0oP9cXBktJ7dgz/hRjnzXFykr49Lkujyt7ngselH9ruQZrUkFmBSZ62K98CX6 DJnk3gIxxNdTCetoodlDhasTcQHlDHzbMVpNtYiyKTaHES0g3/M/clveALUr34dsj7PV KVO/PGaDY/tnstk98Z7UWCfg6z5XTZ7nFUbeSBkDHkOkwMXQ9jo/daYbSIdb15yl+Jn1 zESQ== X-Gm-Message-State: AODbwcB+vVts5jt0JwuYwoR10IppDiv6Dv0bkD6JTV05p4NcxzDlqnMe nf4TCgn4WSPwhefn5Dq3sA== X-Received: by 10.223.169.78 with SMTP id u72mr18370633wrc.193.1495622548326; Wed, 24 May 2017 03:42:28 -0700 (PDT) Received: from mjurczyk.krp.corp.google.com ([172.28.242.6]) by smtp.gmail.com with ESMTPSA id 30sm3781706wrp.6.2017.05.24.03.42.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 May 2017 03:42:27 -0700 (PDT) From: Mateusz Jurczyk To: Samuel Ortiz , "David S. Miller" Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, security@kernel.org Subject: [PATCH] nfc: Ensure presence of required attributes in the activate_target netlink handler Date: Wed, 24 May 2017 12:42:26 +0200 Message-Id: <20170524104226.14841-1-mjurczyk@google.com> X-Mailer: git-send-email 2.13.0.219.gdb65acc882-goog Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- net/nfc/netlink.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c index 6b0850e63e09..b251fb936a27 100644 --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c @@ -907,7 +907,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]);