Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3389076pxf; Mon, 5 Apr 2021 10:42:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyimxtWzze035a9UdeNIzcVZo+/4zZe7QlqgJbeAlQUpla11rw+zuTXHxEdxrgG9r4xsrz9 X-Received: by 2002:a5e:9908:: with SMTP id t8mr21136079ioj.101.1617644567231; Mon, 05 Apr 2021 10:42:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617644567; cv=none; d=google.com; s=arc-20160816; b=Zdi17twqlUdEcM1uFS9XZgqtOJB9wX2Sg1nFWDzJ/t8MBzxS6LA0RTGh34lPVeamJM /IjknjyVJuh7E7AYFCPIGJV+GYtJsANXhtmoPEUKASbUxihB0CAy/+9BAxwfb+1p16Kc 1wjCHcAqJBEgwGswvRWBDebE+2/OpwuoqEIC1hPH+Sw4pQxHs1tc7vV3pqHYgP3wu8Qq QeAudpYov857WPdymORMKzOf76MlWU7hE4+nfQtzHCKene/QTRyWjxgRlXkCALpzxieE Yhws8vDQ/FadfYJgLFyVN+EJN1cpHhgsOpwl5M8We/14fDwh+4RxO8xznokw5/WyaQDv V53A== 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=j8nNDT7ik287AGlh4V8xCc/+t7qPueCgmibQ66nhcD8=; b=COpfsQ3DJpys2YhN8fCQo7GNSfIDlwpCD29mNHXRifO2z6fpIcaUtxfFizjUEHim8V fhJaI4kqUK+bkohsxDkg3FNPIqFwlL2bhU8vecyqUBBIxbAKiNFRUKuRt4JPa1GyLZcp c0NLDwIT3qWua5QUA7K9Vor5y2oy1Q1pGUkTADfVMXIeGON7tY0BKcmgW98dYtLW6XYX B/S4kSPpBEfDZV4BeQxkE/aHN1vUh6zoJTyUmGeEW9frqS4IdXaBu4ULojej+bQqHQr4 1YtS8LkWoAHfA7USNetNmc5A4jfaYBy4orcgvl9EHtrxOf9Tbl+o8E7rfLerPNwuquv5 ueIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=btmFYLd8; 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=pass (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 p8si14665950ilm.53.2021.04.05.10.42.35; Mon, 05 Apr 2021 10:42:47 -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=@linuxfoundation.org header.s=korg header.b=btmFYLd8; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240144AbhDEJXz (ORCPT + 99 others); Mon, 5 Apr 2021 05:23:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:40670 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239926AbhDEJSO (ORCPT ); Mon, 5 Apr 2021 05:18:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9F8DA61387; Mon, 5 Apr 2021 09:18:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617614288; bh=6jV/f9eFRf6AafyyWRwu6QXjI+04Oryi/+TjtsHveLU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=btmFYLd81xJgfPjRSRj+V4m41qye6fuSHNY8ChagtCX2zCUMUFxBFxsnKq3tBhI5z 8CQKfBAYyQ1dTkElFfCy/Eex6TjtBT5rT6cYs1hn+AZv6eqj3CaMM4alV/h2cPQh29 CGwyHwScF+qTvTLCLFbmFBjh1OKv2Jl7rXquUJio= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Atul Gopinathan Subject: [PATCH 5.11 146/152] staging: rtl8192e: Change state information from u16 to u8 Date: Mon, 5 Apr 2021 10:54:55 +0200 Message-Id: <20210405085038.963411897@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085034.233917714@linuxfoundation.org> References: <20210405085034.233917714@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: Atul Gopinathan commit e78836ae76d20f38eed8c8c67f21db97529949da upstream. The "u16 CcxRmState[2];" array field in struct "rtllib_network" has 4 bytes in total while the operations performed on this array through-out the code base are only 2 bytes. The "CcxRmState" field is fed only 2 bytes of data using memcpy(): (In rtllib_rx.c:1972) memcpy(network->CcxRmState, &info_element->data[4], 2) With "info_element->data[]" being a u8 array, if 2 bytes are written into "CcxRmState" (whose one element is u16 size), then the 2 u8 elements from "data[]" gets squashed and written into the first element ("CcxRmState[0]") while the second element ("CcxRmState[1]") is never fed with any data. Same in file rtllib_rx.c:2522: memcpy(dst->CcxRmState, src->CcxRmState, 2); The above line duplicates "src" data to "dst" but only writes 2 bytes (and not 4, which is the actual size). Again, only 1st element gets the value while the 2nd element remains uninitialized. This later makes operations done with CcxRmState unpredictable in the following lines as the 1st element is having a squashed number while the 2nd element is having an uninitialized random number. rtllib_rx.c:1973: if (network->CcxRmState[0] != 0) rtllib_rx.c:1977: network->MBssidMask = network->CcxRmState[1] & 0x07; network->MBssidMask is also of type u8 and not u16. Fix this by changing the type of "CcxRmState" from u16 to u8 so that the data written into this array and read from it make sense and are not random values. NOTE: The wrong initialization of "CcxRmState" can be seen in the following commit: commit ecdfa44610fa ("Staging: add Realtek 8192 PCI wireless driver") The above commit created a file `rtl8192e/ieee80211.h` which used to have the faulty line. The file has been deleted (or possibly renamed) with the contents copied in to a new file `rtl8192e/rtllib.h` along with additional code in the commit 94a799425eee (tagged in Fixes). Fixes: 94a799425eee ("From: wlanfae [PATCH 1/8] rtl8192e: Import new version of driver from realtek") Cc: stable@vger.kernel.org Signed-off-by: Atul Gopinathan Link: https://lore.kernel.org/r/20210323113413.29179-2-atulgopinathan@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/rtllib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1105,7 +1105,7 @@ struct rtllib_network { bool bWithAironetIE; bool bCkipSupported; bool bCcxRmEnable; - u16 CcxRmState[2]; + u8 CcxRmState[2]; bool bMBssidValid; u8 MBssidMask; u8 MBssid[ETH_ALEN];