Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp4298640pxu; Mon, 12 Oct 2020 15:23:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwfbSK/Cji2s4mCvOV4tDeL6MCmbUg5ok5ZuL6IUu4LZYYHrsnP5x+wKBTQgb88EPiSWUxK X-Received: by 2002:a17:907:392:: with SMTP id ss18mr30363500ejb.429.1602541395349; Mon, 12 Oct 2020 15:23:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602541395; cv=none; d=google.com; s=arc-20160816; b=KHyVMr6AJrnIw0BbMtffoa3lIIqi7Afo/0LMmlImDdj17HD22M/9xDjPikYkCDFerW EUX4v+H7m40iGTtXdsZN7uS+kb7JFpAnVO/UPs9cSC1rLRyYF2lSBiz15Jflvmbmx7UV oRSv4xF7XebsHJE6suEeqi5KJ757h4qExKzCNq+TwFZNbdI9Sid0d4uqBzegJ2TYe4RR iWpgVkZaXGFOlo8jJaMmXCWgDpaxG6dq46Gpm2sgMBKczDoy7m8TR8NxlmFUvlexQZCv 0NCmiWDvxbm3RGbiu60Yh/d6hzKSz523Le5X+s+bVPIIqfO+AmdkJlTOdQ96RQPxESLE sMNg== 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=h7Ti6N/GeeFoms3iAgyhbjBCOis4ptegsji722DOb1w=; b=ZtevMuaGD+1VV9T2hglp09jP1g24z+zS6Fo2gGTc7Ahy4dfec+RBfdtJ+kzCjYndkj 62KkaLVlg8kmLgergVGhKeakf/bHU6z4wN9uuiPOL2N+HMph2u927JQPMa1SS5abFVDN OMyeGdqHy4pkO7SqsUCxAQU65pebkoacIsMvfepdu1hfAU04OewsvlO6UYiZKwZceNoA jXfuqmG38K3ZFOEhl8zqL5HezELPvdSWb0nWVJ9Su2OOJcp9Hb5fx6nW//hwpvSlQPTT BFQTK71dQFruyO8HXBUiA2IxbmyKAq1Bigei1FWoUCLkDPTitBxtZEqU+p/2NltTeT0C zpQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zIOR4vJg; 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 cm23si12930834edb.19.2020.10.12.15.22.52; Mon, 12 Oct 2020 15:23:15 -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=zIOR4vJg; 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 S2388643AbgJLNhy (ORCPT + 99 others); Mon, 12 Oct 2020 09:37:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:40136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730995AbgJLNhO (ORCPT ); Mon, 12 Oct 2020 09:37:14 -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 0F8A620BED; Mon, 12 Oct 2020 13:36:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602509804; bh=5VF1aGF0snDD0yIQKYYR3G5Txb5QXIRXjJ5xA2iuFLQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zIOR4vJgZt/7T/Y+4aMS8DG5ZpeQtkUNYAT1IGLzAuArxIFd2JdehvsOD+23JeKTF L+loU2IJB+ZujqGXl35GbXt/Yq4mb82yMcDwQh3WSHCg9eqZlKteGSG4SHd6zoHEFV EAOYPimWXbQSA4/vdQoyuDUO+1ETFNzoS1/3fGlk= 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 4.14 36/70] net: wireless: nl80211: fix out-of-bounds access in nl80211_del_key() Date: Mon, 12 Oct 2020 15:26:52 +0200 Message-Id: <20201012132631.914396871@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012132630.201442517@linuxfoundation.org> References: <20201012132630.201442517@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 @@ -3343,6 +3343,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]);