From patchwork Thu Mar 19 12:59:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 228960 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, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 4C12DC4332D for ; Thu, 19 Mar 2020 13:35:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 23F8420787 for ; Thu, 19 Mar 2020 13:35:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584624945; bh=b5TTVW7188gt4/nG313X27wCLCsYHEoj3altvGYn27I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=q0s5PMhGLXygPsA+JIvfmInRxQKe+KdRSVJnn8X39+BJaJW6cgyKA1xYB+bMrxYU8 dq5tB0GDDIdPlTJYuDr3AWzVb5ydhzwMUrHba4CXko7yaGaOaA9IDRhbDRl5dTzh+F 4jYrTQ6QQI95oHautapOaY8Qf0jcpnvOcCLwUSis= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728690AbgCSNLM (ORCPT ); Thu, 19 Mar 2020 09:11:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:56282 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728686AbgCSNLL (ORCPT ); Thu, 19 Mar 2020 09:11:11 -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 09A5E20722; Thu, 19 Mar 2020 13:11:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584623471; bh=b5TTVW7188gt4/nG313X27wCLCsYHEoj3altvGYn27I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SUg12DomGIv/RrWrHgOIOXb86uMtRvy3YxAun6u5EVi8CFgD4LuevQwSKfeQJTfqD g5n5arMjCbphLXd/9SrqB9sfw9DHCSjznP16gma20hbJlcqGKCrzxhu99O5LvYcj/u 4XelmQYn9pqMmvVqRexem7/OlvhySZhi2frqWN6w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jakub Kicinski , "David S. Miller" Subject: [PATCH 4.9 19/90] nfc: add missing attribute validation for vendor subcommand Date: Thu, 19 Mar 2020 13:59:41 +0100 Message-Id: <20200319123934.698294610@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200319123928.635114118@linuxfoundation.org> References: <20200319123928.635114118@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jakub Kicinski [ Upstream commit 6ba3da446551f2150fadbf8c7788edcb977683d3 ] Add missing attribute validation for vendor subcommand attributes to the netlink policy. Fixes: 9e58095f9660 ("NFC: netlink: Implement vendor command support") Signed-off-by: Jakub Kicinski Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/nfc/netlink.c | 2 ++ 1 file changed, 2 insertions(+) --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c @@ -64,6 +64,8 @@ static const struct nla_policy nfc_genl_ .len = NFC_FIRMWARE_NAME_MAXSIZE }, [NFC_ATTR_SE_INDEX] = { .type = NLA_U32 }, [NFC_ATTR_SE_APDU] = { .type = NLA_BINARY }, + [NFC_ATTR_VENDOR_ID] = { .type = NLA_U32 }, + [NFC_ATTR_VENDOR_SUBCMD] = { .type = NLA_U32 }, [NFC_ATTR_VENDOR_DATA] = { .type = NLA_BINARY }, };