Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3192020pxf; Mon, 5 Apr 2021 05:51:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJySmSZlSnh6OEO7wTEH16TmzhXgFMInr0DNVr7USKOIwJtTiDjX5zl5eDe+MmtItWwfdp5g X-Received: by 2002:a05:6402:3493:: with SMTP id v19mr32187291edc.355.1617627084493; 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=MWDWcmetz1CbHjJ7dYlnUPTRIeovfmUtGsR16YnYKOWKSD/IVNFXUbC81ys7rm4T/Q J9JQ5/BcH9WIOcsucsFfL/PQ0qw24Mdp2nlioimGcuvsjs4IjByNAJYxkOE59ZXdb/ns GIcxSFCwFQozg6JDCFcjEkUvGqd0YY3hrGJYEuCuHQ29n56+L9zNU8ArvNzVEH2DWm4z P9POCUvicxSg1WMnviqK2fZnzcyNbMKAqThOSHbR5e8M9za42fnh2Bjs5LNXTSlD7Gii ccbWl8Z4AGLsxtJJT+ciXLAfO/NIWNh11Ppc9cIEvVAAzEYFJsoJ2KTWw+j7pfTgaFom ikBg== 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=n7eaxaCUWKa+vhbhZKIR2Z3fRL0Bkpzw/ZitOhnQnJ4=; b=pqDyh8Ed3pzAnQJkKMY1yxMhJ9VEZ5EZLR76mCQfJEMyJODSeOWvm33eZ4uWe0mZHI nDcb+njaeK1tOn7dLBahtMPypIWTFlOp8kVMN6PTqMpFP0JPk0047eCQuNx4C2SzAzTu FAiobsT5ShozBY2YiXFnzbdq0SwU5C//H7YedAw7yhICUF5831t70MzxVnqmLW6oJwzG R9aXwM8Fh9e0ai8EmpBrR2PpcKIWwayqa2++f82Dr87msLXXPAtGLXAK6iI7NhyTOMXu ymx7RYn7yLd0905NGvnkVXs8LCwYQaNhzIzCQJZmWfHKSRCyBvYpYrOfSMy0qoX8ZolR 6aog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xEb1gchf; 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 l33si15338808ede.161.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=xEb1gchf; 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 S237205AbhDEJAa (ORCPT + 99 others); Mon, 5 Apr 2021 05:00:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:40930 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237049AbhDEI7u (ORCPT ); Mon, 5 Apr 2021 04:59:50 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7227460238; Mon, 5 Apr 2021 08:59:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617613184; bh=diM6It5E7UCmROdwlQZyjDQqpu4vcXZq88LiZnYlkJI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xEb1gchftEzfRV2XdId6FeWP2TY3I/KqFQDwfjWvNfg9EeRedFnmZ7xVmlPGNXAdZ IKDVZ/cG1rSCdAt4Facund9KP+Cmi8zOd+FyOUoszOT1WFkzaEmtVPU/6HC/Bk33Vx 2rjsXVBjlJtflbtBitWenOW8cLkExiuXjGg6MC7g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Atul Gopinathan Subject: [PATCH 4.14 50/52] staging: rtl8192e: Fix incorrect source in memcpy() Date: Mon, 5 Apr 2021 10:54:16 +0200 Message-Id: <20210405085023.608316474@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 72ad25fbbb78930f892b191637359ab5b94b3190 upstream. The variable "info_element" is of the following type: struct rtllib_info_element *info_element defined in drivers/staging/rtl8192e/rtllib.h: struct rtllib_info_element { u8 id; u8 len; u8 data[]; } __packed; The "len" field defines the size of the "data[]" array. The code is supposed to check if "info_element->len" is greater than 4 and later equal to 6. If this is satisfied then, the last two bytes (the 4th and 5th element of u8 "data[]" array) are copied into "network->CcxRmState". Right now the code uses "memcpy()" with the source as "&info_element[4]" which would copy in wrong and unintended information. The struct "rtllib_info_element" has a size of 2 bytes for "id" and "len", therefore indexing will be done in interval of 2 bytes. So, "info_element[4]" would point to data which is beyond the memory allocated for this pointer (that is, at x+8, while "info_element" has been allocated only from x to x+7 (2 + 6 => 8 bytes)). This patch rectifies this error by using "&info_element->data[4]" which correctly copies the last two bytes of "data[]". NOTE: The faulty line of code came from the following commit: commit ecdfa44610fa ("Staging: add Realtek 8192 PCI wireless driver") The above commit created the file `rtl8192e/ieee80211/ieee80211_rx.c` which had the faulty line of code. This file has been deleted (or possibly renamed) with the contents copied in to a new file `rtl8192e/rtllib_rx.c` 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-1-atulgopinathan@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8192e/rtllib_rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1979,7 +1979,7 @@ static void rtllib_parse_mife_generic(st info_element->data[2] == 0x96 && info_element->data[3] == 0x01) { if (info_element->len == 6) { - memcpy(network->CcxRmState, &info_element[4], 2); + memcpy(network->CcxRmState, &info_element->data[4], 2); if (network->CcxRmState[0] != 0) network->bCcxRmEnable = true; else