Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp246165pxx; Wed, 28 Oct 2020 04:01:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrgFrC5dic3d8neqze6gfgfSoHRLev/ZX2FS/9DXyPA4bzNslA7vNsTyzTG5G+DNpmKqmk X-Received: by 2002:a17:906:4811:: with SMTP id w17mr6625326ejq.431.1603882862635; Wed, 28 Oct 2020 04:01:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603882862; cv=none; d=google.com; s=arc-20160816; b=oKZ2oyFKbZXW96OciEaLAJxJS6LGHO4WDIB7SspP5URLxmJekMZzH71fI+EPXG0Z27 yKSJ2mg/Dr8PmXET6sy7y+OxVkGtFUkq/JUEp5/sxivVcn0saE+PW0Co9YcN/VHWTfUl UP59GOVFLYdTv/ivJk5k1QxeVvkdZsVB6vkbE14+2+4ld60ilUsMhKEphEmXCM7nge7J tWqKSL6Z6Kdn1bl++bpfHC7ic9Elqs4zWmNq7xfDC/JpT+mNRcZrOD4J5V7smBpE4lhD Ge6RTSr0HPGjLnm09IoeSOnOEObcuXs8FCJA2A0M2tN/mzlykR29roQKDPVsZwP4Zt6h tseA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JP++TPqrfmh7KIOHgzakdCDmJufzh1sM91aVXFu3/xw=; b=tMc14JkDzdX7A0VuyffDEVuxc5+mAhKhz79TIOyadNVg3bcWlEvkszyXeyDxj01eKO lfSRxXdZDDkYqJsv5Q3ghDMBY++1oHiS1M1iM1mS24O0is9SSAlBxdsZwm1PuqbtYkEQ pUsogPmMHTSlnzg2UC06XNVZcJ4Ay6VVPvXgNeYsayI6qZ6nTrBibLosQ8pUshjol5EI etpn9IN8yZ/yBgm0RGuwZXCUi5+87MXPualL7VW5WghbHKZXpDKhVK3UYuP9dE6Yrr76 NitYSwsQy/84wmGSTS9qyDaMdpUcH6mcX43TColZzadpF9dOAh6ucrnxy2c69TfdKu1I INMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=u4y2mFqL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a42si3838927edf.535.2020.10.28.04.00.40; Wed, 28 Oct 2020 04:01:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=u4y2mFqL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1783528AbgJ0O6W (ORCPT + 99 others); Tue, 27 Oct 2020 10:58:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:50546 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1773051AbgJ0OvF (ORCPT ); Tue, 27 Oct 2020 10:51:05 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 6320E206E5; Tue, 27 Oct 2020 14:51:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810264; bh=/ARRHX8iZJ+0pJY/FAygQRbrsoRnoGa5NaRbN1SqMDI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u4y2mFqL4pTD4BkU1p40gy0IPr4KtojbEqaEdg2Vy6oCAq5eL81pKvDCeK5oXevPE vMo8vYRBBYFbp0sO1j3uYhe9G28dm6SGpl+wuicANEoVVXMPgr0uiAW0Nv89t5u2V1 wB8v0QB2eyHd6krvYuxP2/F7J6Bc4yrcArRzuKUc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Defang Bo , Jakub Kicinski Subject: [PATCH 5.8 048/633] nfc: Ensure presence of NFC_ATTR_FIRMWARE_NAME attribute in nfc_genl_fw_download() Date: Tue, 27 Oct 2020 14:46:31 +0100 Message-Id: <20201027135524.954054598@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Defang Bo [ Upstream commit 280e3ebdafb863b3cb50d5842f056267e15bf40c ] Check that the NFC_ATTR_FIRMWARE_NAME attributes 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. Similar to commit a0323b979f81 ("nfc: Ensure presence of required attributes in the activate_target handler"). Fixes: 9674da8759df ("NFC: Add firmware upload netlink command") Signed-off-by: Defang Bo Link: https://lore.kernel.org/r/1603107538-4744-1-git-send-email-bodefang@126.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/nfc/netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c @@ -1217,7 +1217,7 @@ static int nfc_genl_fw_download(struct s u32 idx; char firmware_name[NFC_FIRMWARE_NAME_MAXSIZE + 1]; - 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]);