Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp648794pxy; Wed, 5 May 2021 10:17:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzgJXe0lCPtyyW6JkkJ8EL9AtiK5pjpxxjYoawWR16KQSHsDaiJW2WMblHgXvQrrouGi/0 X-Received: by 2002:a17:902:b7c8:b029:ed:2577:8dc3 with SMTP id v8-20020a170902b7c8b02900ed25778dc3mr32473026plz.9.1620235064652; Wed, 05 May 2021 10:17:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620235064; cv=none; d=google.com; s=arc-20160816; b=XHUkZpv8NyPuilO69M1DdXu0XoUs1tV/7/vWZ3mREwUEQQ3ty0qD9wKIn+ak5aHqMW jgWmQNwA+iofmZsLHWs1P9/mVFbvc/uKnlMs4JOwAEYOHRv01ld6ImWhQw7Xq6MaiExl R07Aq3cp03VcIO0I4X2Eb5c5lKah2PW/WQGvNDPzsAKu8FpY9b2oaMG5SwR06fZTADQ/ 7gqu6ANAq2ZRzLeMEDy3YjhQ6DsduTMfE4ajKJKXO2L15b2Jz1/ZoiE5zC8mzZf5FV3a l8B+Musfp3Vz9Bl7WTWlCkJiRHNOeaT+fNmkVRW2pow9tFJIoSXv+Hppe0v26sl+vDTp o6nw== 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=YVuf1s9rFVwgVNfwTDSnv6yVCYc0DA7oeQd63dxvQ1w=; b=yAgd0oQ7H867iVcYpjD8yKK5f1W/S9iC5RtBAFZbHVRWUV9gMx1BU8VTkYnX2gDNKf MhCIc4POjRgHZPIEYUtVg+MkgGMcREhF9Iegw111z0+5MSBct9QoEE2c2hTMlfY+Uxih KK/WBPdX42U3NEU8udGw+Qmc/FUl74eA7nsJtRDC7O2ApImOC8Rs6lZYCjUa08f3SwtJ 1/15ttAqpOWfArifyOq30b4deZWewniVVK4qUkJjJE15ZVs1mH+1tXx/0z3vAQMBi7Zt RUEAe/LERizHxadaTrDpygug75M6qWBblwhFlTAzKbgWY65yAKmbSQkwN9ggZsX0Y0iz i1xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="QMzzO/cb"; 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 t12si8378236plo.132.2021.05.05.10.17.31; Wed, 05 May 2021 10:17:44 -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="QMzzO/cb"; 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 S237694AbhEERMk (ORCPT + 99 others); Wed, 5 May 2021 13:12:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:44940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237185AbhEEQ7V (ORCPT ); Wed, 5 May 2021 12:59:21 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 34B39619A9; Wed, 5 May 2021 16:39:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620232797; bh=dgAa2UF2g95aptcaS8MYcsNqgBJZ5ZbWtL3Cy9DdzoY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QMzzO/cbxaIOYO68J4cDgYKGrmipgQJ6fXPmIiC+CHhjJvq1Ji6Chc12cRuj/wTzL KNo2q01Z2zlKV8eqE/uJDShaYbTvoS6itgXfS49cOL8T47s07j8zVDVSTQM6iqZNu8 LnWyzbmqLa9GMEqTMQRSkMsvkbej50X7VedG+DlK8Bq3kO9XJYipvjC5S0Dgh4Quee niu6GpxDq0VJLwImRqKh2l+S2gCxqkabteHOuZiK9KKimZ95pFo8M1A5+8lZ6uy0rr TVY8ch+WC8w/YHEXtxXqq9Bz6Nvk47X1uSDLjYVDQRGbxdBCOmFQQZrRtKaxExJlRo bnfYrjvpjYZ5A== 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.4 41/46] qtnfmac: Fix possible buffer overflow in qtnf_event_handle_external_auth Date: Wed, 5 May 2021 12:38:51 -0400 Message-Id: <20210505163856.3463279-41-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210505163856.3463279-1-sashal@kernel.org> References: <20210505163856.3463279-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 7846383c8828..3f24dbdae8d0 100644 --- a/drivers/net/wireless/quantenna/qtnfmac/event.c +++ b/drivers/net/wireless/quantenna/qtnfmac/event.c @@ -599,8 +599,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