Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3192019pxf; Mon, 5 Apr 2021 05:51:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysNfi4SkFHnoun0h7NFuZ2fztUwAeR74gADNup4M8yNBJBRv2YkQsfzfeHuN3yZLw4qSN+ X-Received: by 2002:a17:906:1e8e:: with SMTP id e14mr14007390ejj.399.1617627084497; Mon, 05 Apr 2021 05:51:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617627084; cv=none; d=google.com; s=arc-20160816; b=QsjxJfs6fUBuYEkJxTHb4mEgH8PXo1NII6StRucG9pttVI9Eqw/kfg+gQ4rWBqdTJe Oil38m55zyRtfGDZpWGtGxFkDNRJHIqBM53hlOPIZfpnNpELQGE+fGqU4AOIlYPkbJSN yoMWTe4wwy4Pfya+IG4MdeG2XF6EVerQ+fGFE5KNmUx8wi2XGxtUxmbcDMin58xM4TrY kro2SGCo2Pc6j9v4oWUq9Fpk2aRz3oazU+sdPbZ4z6gXi8cIj1IxrynZxe/ERXP7rPyi 7BsttZ7cXF8PJrTmeFiKCt5NCR/f4Y5llsBSVEg4+VXn/toytQxT5SMGjfQ3A4wFmQzk 8DUw== 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=lFaAlpGkg2IOia8/4bEosAwlY138g9bd9nTboWTp8Y4=; b=NUMIvMbPk0FVFVu5j61wod+j2Pn5HpkiEBWH0jGOivU664TN4ncJ02dH9OKsPo1Rya pirkAnjocSylvUQWr8mkr6MCx02C1aN4WbSYL1LdfdvHTwZiCOqOboBlR2S566hxWDgA 9rxp1F2ADtnffd/4UPy/2WpAKE0fzGOLJjYq/50ODF5J5g6q32/kWKooKoSvzN7W7i5k pCE8FjcHTK0BYwB+V0nEsLslQ6PwYdQIgeAvAA7CMDdQRgmHSBbjpMQPSOUuFiHGKj94 bHpf94s9CgL/fKaARo8j7ThquPRuW7eGvAFw5wic61IM+/I513CT9gmdtaZ0yEPfKex/ V85g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tGoeYSwT; 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 e18si4729595ejy.719.2021.04.05.05.50.59; Mon, 05 Apr 2021 05:51:24 -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=tGoeYSwT; 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 S237208AbhDEJAh (ORCPT + 99 others); Mon, 5 Apr 2021 05:00:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:40994 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237078AbhDEI7w (ORCPT ); Mon, 5 Apr 2021 04:59:52 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EE53761394; Mon, 5 Apr 2021 08:59:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617613186; bh=wX/fpNQiUvj6q9tk+n+PbQKIH9s4Vpeagy7RLrNXehU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tGoeYSwTQFjoJQt1ObX4NJ0cnhfBlwhPytpFRj2czpM91vLVaQaja+QyazuCsp7LW qIjPGL1NwmFgRn+HL80sk9Xl929nJnTYqUyMHBkN7pSvCXQnLtCf/GhbBVMgVfWbsK r9Kf63aUsyNoxsUufKwIPuhhoG0QaOrTGDZPTX7I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Atul Gopinathan Subject: [PATCH 4.14 51/52] staging: rtl8192e: Change state information from u16 to u8 Date: Mon, 5 Apr 2021 10:54:17 +0200 Message-Id: <20210405085023.646633642@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085021.996963957@linuxfoundation.org> References: <20210405085021.996963957@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 @@ -1110,7 +1110,7 @@ struct rtllib_network { bool bWithAironetIE; bool bCkipSupported; bool bCcxRmEnable; - u16 CcxRmState[2]; + u8 CcxRmState[2]; bool bMBssidValid; u8 MBssidMask; u8 MBssid[ETH_ALEN];