Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3264869pxf; Mon, 5 Apr 2021 07:36:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3KFLijL/VRHs+2x8PSkGP5+Trz43/YtxlNEXdbfl8FQ3VnlyS0fz6E0K32FF8IzjODRDh X-Received: by 2002:a17:906:86c1:: with SMTP id j1mr29580261ejy.373.1617633386634; Mon, 05 Apr 2021 07:36:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617633386; cv=none; d=google.com; s=arc-20160816; b=RUXQdB+Rhi3tiyrCQkTNcWx4GOpHVdUIn4wAH98seAbcDh5pQCYrIR6fKp6Bt0jQQB p4xVTkRDcrJsqiqcD/yxNXz84/bKEC+N1WTS1ZK/3srasw9QFUE52ftGSVy/9nqn5qzF UJh+P2s0hZs45wZy1hsSJlH8vRNcBAWdgf9mPx5oabB8PpYeUMpmz2kZLS6G0szYppSx FGfNRyYp4w0iJbQ630YwomFrctK24dnNu3zPeIihJsM2AkEHpaeq4SGp8NlnboVeqOMC KPCSPgcKop3IaVtLqWEvl6GFk67NeBhTygQlcYuuikv+jN2iBzL+qLdv0PNnFCOYcHVN 6cZQ== 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=0kh1F+i1vLnANetnWXYhjNNjt222E9DsJUYwlfEzTVWAlP9WvSIWnpHW0cKWxK1AjD nhYc3IzzlpiQclO9LSsBQ5b5nQJwgpT+/nWQDGevqCn5nr1q2Nw1DIhPip9+9zHcrbSC w/mxeo7NaQtDSYRT8x6m6GsxBy7bMt71dzht3j+iuUrPbRnUnhwUJ+Hzbcld2baxD0ZE iRUCzWhmaGqHRXjGxD0n/8dQaYNwiLd2nGaJC+EBdyGR5yhrJe/dH6cZSU5aWfd9uJ7H mGl9lBEG2tlfeffpP2IOmP/0rFRrN3yJIkN9R084Kox8JJbVEZmPv7GKN+/X/PaYPZ78 Yc7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oatDMwX2; 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 by24si7895851ejb.564.2021.04.05.07.36.03; Mon, 05 Apr 2021 07:36:26 -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=oatDMwX2; 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 S237774AbhDEJDz (ORCPT + 99 others); Mon, 5 Apr 2021 05:03:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:43758 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237441AbhDEJCY (ORCPT ); Mon, 5 Apr 2021 05:02:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 48DED6138A; Mon, 5 Apr 2021 09:02:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617613338; bh=wX/fpNQiUvj6q9tk+n+PbQKIH9s4Vpeagy7RLrNXehU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oatDMwX2m1M7nqodwqLj/N7g2Zum51zshXNc0MbQpKkAfSXv/s3/NPsasJI1PXWZx r2h0bVHwTFg+wW5fdBtopUwvSR0XavUvQXFzZvXATl/5OUrIdwGuBHkzvpx700X8XK dspzIeFuC9/pSewpQuO1mTl14rfWfFwAic6rIxJQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Atul Gopinathan Subject: [PATCH 4.19 55/56] staging: rtl8192e: Change state information from u16 to u8 Date: Mon, 5 Apr 2021 10:54:26 +0200 Message-Id: <20210405085024.281363850@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210405085022.562176619@linuxfoundation.org> References: <20210405085022.562176619@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];