Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp619866pxy; Wed, 5 May 2021 09:41:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyiRnWYdiRvkmKhHka3WHtNNyMZEhM9ohTWH+yyAjaJRsAP5EbWMgt3t0ygzqbw4qrim8Xf X-Received: by 2002:aa7:cc15:: with SMTP id q21mr34129016edt.140.1620232875008; Wed, 05 May 2021 09:41:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620232875; cv=none; d=google.com; s=arc-20160816; b=dliRvLZ/qphwVmKwIAlMF5z0h3kNpTOVG4HnvmPRSLdJOEn2l3aMKmCfA4cuxOKCa/ aQ/UBo8Lp1l6562ZjqxBn07GHsmBBN+4MoRsRkjqUhCUBpbO1Zb/AjzGVKiMVPI/aAKp UVxQ5hGma3E2aHOYI4L2gKdPIa/MtNPN7Q9ake5AySVoNsJT3zc3DmcXPynxeNGyqUb5 uLKpcmfMVkBlZJQ92C6a/0kaQ9Cfgq5FvdkmBJaqmXDHlV0PcmNnBIau9g6fMAJnyGBF SAO+fcXvhmtimr+M8jd4+UTFNDOmGS7vpRm8jpLbFXtY62v2M8DNOqvfXUDuwQ3awSA1 vOpw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=e7W8xPP6ySyJbXaCBigAf4GSgTjsAHIMNodmQl2yZLU=; b=RXLSjnBdDqe53tx05pUqvKLte+wRacrbEdAxQvKSP7FLg+r1veP91u/LBMoZqNv7cG pTMZl/JWknTpbL5wGPP0g2ceIkiJU443RKJraMh+jsCD228Sk/d9I1hIW7Vdv3ql3tzR 6HY75ESzx3k7VWhI8eBv9svOJsCDodLgKs5C2MoKIAj7ktYFgceU0M4N7gq0gp+CSVZn kVqLa2an2JPxoM98FDCfojtH+oy04oP1Hr0w5Zv6idJ+BEnbv1xyIze+RY2077RMBtua pAv0M/qM+DGmHp9pgMvx4KmUYKnzCx2nfJUVz+DokUdOd3QcbrHsxOaEFH3XeopR7aSG 2Hdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="ZJ/93ym7"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v20si8818844edc.437.2021.05.05.09.40.28; Wed, 05 May 2021 09:41:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-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=k20201202 header.b="ZJ/93ym7"; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234951AbhEEQkn (ORCPT + 99 others); Wed, 5 May 2021 12:40:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:39024 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234737AbhEEQi5 (ORCPT ); Wed, 5 May 2021 12:38:57 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0270761457; Wed, 5 May 2021 16:33:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620232429; bh=lmCl/8+UbLLfBdAII2ABQDwTMsu3Sc1/051k2dkBo2w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZJ/93ym7o9WxX56djYAs23Tr7FR8hZ0yY1kYfd3OgZKYcAbc81ivICvue4cr3zoZD mwGcoIRZ9b1ukOhE5jcS/dfixKNhim5CqB1r+jt6lNAgRcOdH76/Eg/q0UoKXVNmza fD/kdjkDOuzO+5ODA68e0MiYwOSRv6UKANfvL4ocB7DXh63Vq238+zzcvJXoPQsoOE +1p/R79kEsS5K0A0Hgp0uxZrEVKS1xb74ysig5LWMjnzvNJqkz1JtKmke3hTEeN1Lv zpwgOKbJm4q7x4z6rv5oLn/RSlySGcY+2QRxUjn8Fsf7nPNTWwnWYRQstvSCdAvF79 g6nCn1ZUsETUA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lee Gibson , Kalle Valo , Sasha Levin , linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.12 102/116] qtnfmac: Fix possible buffer overflow in qtnf_event_handle_external_auth Date: Wed, 5 May 2021 12:31:10 -0400 Message-Id: <20210505163125.3460440-102-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210505163125.3460440-1-sashal@kernel.org> References: <20210505163125.3460440-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Lee Gibson [ Upstream commit 130f634da1af649205f4a3dd86cbe5c126b57914 ] Function qtnf_event_handle_external_auth calls memcpy without checking the length. A user could control that length and trigger a buffer overflow. Fix by checking the length is within the maximum allowed size. Signed-off-by: Lee Gibson Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20210419145842.345787-1-leegib@gmail.com Signed-off-by: Sasha Levin --- drivers/net/wireless/quantenna/qtnfmac/event.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/quantenna/qtnfmac/event.c b/drivers/net/wireless/quantenna/qtnfmac/event.c index c775c177933b..8dc80574d08d 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/event.c +++ b/drivers/net/wireless/quantenna/qtnfmac/event.c @@ -570,8 +570,10 @@ qtnf_event_handle_external_auth(struct qtnf_vif *vif, return 0; if (ev->ssid_len) { - memcpy(auth.ssid.ssid, ev->ssid, ev->ssid_len); - auth.ssid.ssid_len = ev->ssid_len; + int len = clamp_val(ev->ssid_len, 0, IEEE80211_MAX_SSID_LEN); + + memcpy(auth.ssid.ssid, ev->ssid, len); + auth.ssid.ssid_len = len; } auth.key_mgmt_suite = le32_to_cpu(ev->akm_suite); -- 2.30.2