From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8BF4C10F14 for ; Sun, 6 Oct 2019 17:20:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A25372077B for ; Sun, 6 Oct 2019 17:20:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570382457; bh=KkVNL4aA8iQo3ozBgxTtkTE++45rL8IJDNE11cs+JUs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=V3vGyPRPKpR3j4ofWwMmEURndus6Ck/cIOZ0H1bVUKmNJ5EGHif5T6ihfE7vuHZx7 txAHNW4mT9pL/61G5/tf0PZY/C0tT+4rqlkN9w0Mzc7aEiPICboAFOCqY15etEv+DV ylbN5+WwfPhlA2jhxuJT4eaJwaF5jlQ3szykDD7k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727380AbfJFRU4 (ORCPT ); Sun, 6 Oct 2019 13:20:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:46038 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727375AbfJFRUz (ORCPT ); Sun, 6 Oct 2019 13:20:55 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 882902077B; Sun, 6 Oct 2019 17:20:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570382455; bh=KkVNL4aA8iQo3ozBgxTtkTE++45rL8IJDNE11cs+JUs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=smJ9aQdI/jqSHioMb8r9lvGX3HnKlxVVbhEiPPk23wcnEE5xx/Ve9WXqZmlmkYdlS 6g1vA0DaPHUHDr2Pzg6hEVwll1DjBupNf2CWHqrXidZgSb85uwnO1oD+6NPLoWtsza JwKD8boW9YSDRm1kftxgkUO2G0rYv1xptDuCAwz4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrey Konovalov , Andy Shevchenko , "David S. Miller" Subject: [PATCH 4.4 36/36] NFC: fix attrs checks in netlink interface Date: Sun, 6 Oct 2019 19:19:18 +0200 Message-Id: <20191006171101.240064868@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191006171038.266461022@linuxfoundation.org> References: <20191006171038.266461022@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andrey Konovalov commit 18917d51472fe3b126a3a8f756c6b18085eb8130 upstream. nfc_genl_deactivate_target() relies on the NFC_ATTR_TARGET_INDEX attribute being present, but doesn't check whether it is actually provided by the user. Same goes for nfc_genl_fw_download() and NFC_ATTR_FIRMWARE_NAME. This patch adds appropriate checks. Found with syzkaller. Signed-off-by: Andrey Konovalov Signed-off-by: Andy Shevchenko Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/nfc/netlink.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c @@ -936,7 +936,8 @@ static int nfc_genl_dep_link_down(struct int rc; u32 idx; - if (!info->attrs[NFC_ATTR_DEVICE_INDEX]) + if (!info->attrs[NFC_ATTR_DEVICE_INDEX] || + !info->attrs[NFC_ATTR_TARGET_INDEX]) return -EINVAL; idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]); @@ -985,7 +986,8 @@ 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_FIRMWARE_NAME]) return -EINVAL; idx = nla_get_u32(info->attrs[NFC_ATTR_DEVICE_INDEX]);