Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp3996295pxu; Mon, 12 Oct 2020 06:59:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw0Tvyvr5Cl/I5okwrzO8fODSW2fQEEoUI4OvfSzvYhfijQS/SgD0B6kwbks9UDgvyLLYYf X-Received: by 2002:a05:6402:a4f:: with SMTP id bt15mr14637828edb.345.1602511152064; Mon, 12 Oct 2020 06:59:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602511152; cv=none; d=google.com; s=arc-20160816; b=UrN3nYg8113Vx69eqAvoxtpLTCqErSqxP5UnjVRJaAfKSV2X3Y+BRseEL2sKAtWSpz LEJ11qD/05LDV4+xKMkBaksVfs3vC5urvNEHlq6/xjsKj3dKyqUybIuW/KP+7SdReCZ1 vvn+xoDXioFVLj2qNamqvh5xtT8pwxkDeGLUmfH/+p1JlxGEaDEIqdrSz+xdBol2qxoh 2OUtHh7494HcxWwwhc+IwI5nCIn3oUN4eal4I7LDHOPwBziRAs4esgJzvT/HGcJJStfz RmZyarA3ia9eI6Z89c7JQz0/xdmOXr0DebA8gKB617GIus+tyvse4V8/oSpVKAYSDufo 4GsQ== 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=s5IBk+lrY7dzjRVwSwHYLVz9v9hgY0kS4z4pBzK0xJo=; b=VEujSfMnRC7YEEzuwQWurevyuA4IQZdTUQtRrCaHkkiqIPC12myxLvp544pSFw4c5R 4gjMeu7wm1P0wY11YQEskcqhbkI8bfoUQj542Qt2UiBeZdg95a/7GpyxL5E/MhjYtmec xYBXq0UqmVEMGzyPKm1deXia+AaY8npi9ID9Fghh5iw8IJqxZN8wprpqtj0wcP1mcra+ Pj8pGo1nyHhRQARWs+Zn3x57S5wQudkpdw2ABm0IeOGS12cV+ycO40T77i9T0aPVovSn HdWHK0wLlzOBGToKL5boCyr/s5kXCSsM+XunBsv5dGvoQfdpkr8tRgn+BqSEVtBEHj1U uKkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dxtA9Byc; 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 n9si12159656eja.354.2020.10.12.06.58.49; Mon, 12 Oct 2020 06:59:12 -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=dxtA9Byc; 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 S2390499AbgJLNzj (ORCPT + 99 others); Mon, 12 Oct 2020 09:55:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:46748 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389651AbgJLNpk (ORCPT ); Mon, 12 Oct 2020 09:45:40 -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 154E322260; Mon, 12 Oct 2020 13:44:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602510257; bh=o1m9s6MnzVt3J4IWQ9ycSCEP8hCKJGnaDSBvWXmk75w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dxtA9Bycguc9VzW2rKrpSct0AzIIPBMihMG0FgH+ggU57VOstEeJhBwGkK+DvORRP tKplQJTdUz+HGKb6zJde4Zt4du+Q3zO3ndDXZoLfHI4D8P0JXF1y8n7LqG1JgpihLd xK6BmfqF4CJuOSXrJkA2PElaEprzAjy7A/0fxitY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+b1bb342d1d097516cbda@syzkaller.appspotmail.com, Anant Thazhemadam , Johannes Berg Subject: [PATCH 5.8 008/124] net: wireless: nl80211: fix out-of-bounds access in nl80211_del_key() Date: Mon, 12 Oct 2020 15:30:12 +0200 Message-Id: <20201012133147.250879494@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012133146.834528783@linuxfoundation.org> References: <20201012133146.834528783@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: Anant Thazhemadam commit 3dc289f8f139997f4e9d3cfccf8738f20d23e47b upstream. In nl80211_parse_key(), key.idx is first initialized as -1. If this value of key.idx remains unmodified and gets returned, and nl80211_key_allowed() also returns 0, then rdev_del_key() gets called with key.idx = -1. This causes an out-of-bounds array access. Handle this issue by checking if the value of key.idx after nl80211_parse_key() is called and return -EINVAL if key.idx < 0. Cc: stable@vger.kernel.org Reported-by: syzbot+b1bb342d1d097516cbda@syzkaller.appspotmail.com Tested-by: syzbot+b1bb342d1d097516cbda@syzkaller.appspotmail.com Signed-off-by: Anant Thazhemadam Link: https://lore.kernel.org/r/20201007035401.9522-1-anant.thazhemadam@gmail.com Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- net/wireless/nl80211.c | 3 +++ 1 file changed, 3 insertions(+) --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4172,6 +4172,9 @@ static int nl80211_del_key(struct sk_buf if (err) return err; + if (key.idx < 0) + return -EINVAL; + if (info->attrs[NL80211_ATTR_MAC]) mac_addr = nla_data(info->attrs[NL80211_ATTR_MAC]);