From patchwork Fri Nov 28 16:41:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 415914 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C44BD140140 for ; Sat, 29 Nov 2014 03:41:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752053AbaK1Ql2 (ORCPT ); Fri, 28 Nov 2014 11:41:28 -0500 Received: from mail-oi0-f52.google.com ([209.85.218.52]:42904 "EHLO mail-oi0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752010AbaK1Ql0 (ORCPT ); Fri, 28 Nov 2014 11:41:26 -0500 Received: by mail-oi0-f52.google.com with SMTP id h136so4788396oig.25 for ; Fri, 28 Nov 2014 08:41:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=TORzAwUHBzH1UfaeD172b0SX6KaH5gmoOFD4n1EASCg=; b=sQ3vWYxvTQ5anZDNImD2guKWcsw2nqVesAU4+Z7Ayegf6aVZ5Eugea8dOIC2/QaSxb HmBCBQfZhjW5ujDimhKYmYxy/tvOw2hJ6Jf8k5QpWr4OilFtv7nQ3BsN9VZAG36RKhm8 f/9otPI4GvjTrkRu787LYp4o6m8tD6IrlMQ0uqVXt5C0YBvo34vC5cGxwDAC5bacDzEP 0nr5tW5m6XJbk4/0V+fq/MTg3KirZekw35u0SezGFdIRSS8F0ouM6GBUISkUH+cGS1sj uEtJH99Pqa+RPxwuGhHjannm/s0Au/EOhViNiO6PbEMO6UjqtVlIvXzvjIuTfbOOAnVq nP0A== X-Received: by 10.182.133.104 with SMTP id pb8mr27431004obb.81.1417192885648; Fri, 28 Nov 2014 08:41:25 -0800 (PST) Received: from linux.site ([69.76.245.152]) by mx.google.com with ESMTPSA id y6sm4582150oes.0.2014.11.28.08.41.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 28 Nov 2014 08:41:25 -0800 (PST) From: Larry Finger To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Larry Finger , netdev@vger.kernel.org, Catalin Iacob Subject: [PATCH 1/3 for 3.18] rtlwifi: rtl8192ce: Fix editing error that causes silent memory corruption Date: Fri, 28 Nov 2014 10:41:14 -0600 Message-Id: <1417192876-12101-2-git-send-email-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1417192876-12101-1-git-send-email-Larry.Finger@lwfinger.net> References: <1417192876-12101-1-git-send-email-Larry.Finger@lwfinger.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In the major update of the rtlwifi-family of drivers, there was an editing mistake. Unfortunately, this particular error leads to memory corruption that silently leads to failure of the system. This patch is one of three needed to fix the kernel regression reported at https://bugzilla.kernel.org/show_bug.cgi?id=88951. Signed-off-by: Larry Finger Reported-by: Catalin Iacob Tested-by: Catalin Iacob Cc: Catalin Iacob --- drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c index dc3d20b..0916275 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c @@ -720,16 +720,15 @@ u32 rtl92ce_get_desc(u8 *p_desc, bool istx, u8 desc_name) break; } } else { - struct rx_desc_92c *pdesc = (struct rx_desc_92c *)p_desc; switch (desc_name) { case HW_DESC_OWN: - ret = GET_RX_DESC_OWN(pdesc); + ret = GET_RX_DESC_OWN(p_desc); break; case HW_DESC_RXPKT_LEN: - ret = GET_RX_DESC_PKT_LEN(pdesc); + ret = GET_RX_DESC_PKT_LEN(p_desc); break; case HW_DESC_RXBUFF_ADDR: - ret = GET_RX_STATUS_DESC_BUFF_ADDR(pdesc); + ret = GET_RX_DESC_BUFF_ADDR(p_desc); break; default: RT_ASSERT(false, "ERR rxdesc :%d not process\n",