Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3097427pxf; Mon, 5 Apr 2021 03:11:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7pSr6i5j3HX4FCRcc3Q1K9VD7sMaU68JKPN5h3xSZM/n9NEFMEk3J8y39E5s2EOuxkVjH X-Received: by 2002:a17:906:6c4:: with SMTP id v4mr27093920ejb.198.1617617477645; Mon, 05 Apr 2021 03:11:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617617477; cv=none; d=google.com; s=arc-20160816; b=hAYiOiDoOIt/7S1pqy01HCxLx6j04XgaJzQriO3p/16itL3Ixiu3MnVYz7DWlQbRF8 p/EwRXKH+/5zBAR9ol95GEPbWTyx0rWktwnjkoJroAnVUr5LuAzjTdNlCQ4AOUlnsbJX HLNOqn00b4CGS3mFoZh09Co+W+vSFsVmjZI+KE9zXwxgBsHEAdHPP5w1InTGXrXzrrpS C7bE+eSE/JMWHFIOFXwWzovFCIorSg35OurNXnDATlZBgTVGTLDAGQlxio/6K5VfyJdt T/VBtk3eil33j1oEVYutdhht3L0P6Wj2lokRH+u9ySVIhe8hEzb+g1BQyglAgC+wH66i e2FA== 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=A9Edj+DxAbTHfDpsIAbDhE+pi5UlG8HGOq6KFJs7xMw=; b=UQkl8Iv1DIBeQO7ekv6Ohcj73yN4nU2d1O0ligdfpWw/tC5LPyMkX8Jx2obx3JGjri /6GFGpvgkpPg+LxUFSMhGkYVYX0ABJKGSl88/mVxH7rNG3g4Wxs/c9r4iwBQGGqUSPR7 4eoOEYgVcpQgXeewDJz43By50VIjGmCuZhv6XYQMXmjrCUtIWS/IzYnjJhurQoWMrKN8 CuttkvHNdNfsL2yZgHWP5F0bDXno8Vj4y3DwxZ96xHmqyLYrP7fsrcTBW1Ap3sxAKlxg Pg3mzcJZmemFbv3F/dGQ6x6nCGpN+i5uzKaIPiry0/jcv9YdgYw9Na3RXJRxexpk0z4H EdNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=p3fImkGC; 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 aj16si4881018ejc.96.2021.04.05.03.10.54; Mon, 05 Apr 2021 03:11:17 -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=p3fImkGC; 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 S232837AbhDEI4S (ORCPT + 99 others); Mon, 5 Apr 2021 04:56:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:34516 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232841AbhDEI4K (ORCPT ); Mon, 5 Apr 2021 04:56:10 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6276E61245; Mon, 5 Apr 2021 08:56:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617612964; bh=vgIbxfGf4Yc0CYaS0CQPR7umn24F1+8lruYE4uj8dAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p3fImkGC+ZzO2yesKhlMN5nUQralhYcdXUYyXL2bdpjzHhmOnCn8US/FESt1nKL4p +D8DzW0OVhOdTKbV0V3SqsdIEkaYBvzOZTuljZ4TAIgG1KTNkVr+apJiEOu8t9S6Kf BGDwvw31gd1CDR389VBRnmYqDExUBSmmpjnUFavc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Atul Gopinathan Subject: [PATCH 4.4 28/28] staging: rtl8192e: Change state information from u16 to u8 Date: Mon, 5 Apr 2021 10:54:02 +0200 Message-Id: <20210405085017.908234703@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085017.012074144@linuxfoundation.org> References: <20210405085017.012074144@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 @@ -1160,7 +1160,7 @@ struct rtllib_network { bool bWithAironetIE; bool bCkipSupported; bool bCcxRmEnable; - u16 CcxRmState[2]; + u8 CcxRmState[2]; bool bMBssidValid; u8 MBssidMask; u8 MBssid[ETH_ALEN];