From patchwork Sat Feb 4 18:41:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9555713 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CDB8A60424 for ; Sat, 4 Feb 2017 18:41:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4DE426861 for ; Sat, 4 Feb 2017 18:41:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B771C26E73; Sat, 4 Feb 2017 18:41:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76CA926861 for ; Sat, 4 Feb 2017 18:41:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751101AbdBDSlb (ORCPT ); Sat, 4 Feb 2017 13:41:31 -0500 Received: from mail-oi0-f65.google.com ([209.85.218.65]:34501 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750890AbdBDSla (ORCPT ); Sat, 4 Feb 2017 13:41:30 -0500 Received: by mail-oi0-f65.google.com with SMTP id w144so3805563oiw.1; Sat, 04 Feb 2017 10:41:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to; bh=x+6hugWS3tKHJsUqUkVDlrG8PxzFL7BYQpzN0aiOkHw=; b=jfYbvurxkDlmQ74Ix1Xz2xkt5Jkv46gQdMey7FN9Ii1EmWdsuCEGf/L895kxz98SlI ZJjfFAedLiF2lSXSd9ccQnxZ23yXUmLqMA3TAVTqvyBMCiV1sYPwuAWkUrw+JipSAFIh K2pLSO5RjSH6yZ0eKH8ch4YVabQadBHM+H1G1+cn/9ke8QpfAosHpavjALWfLgLzKK+h /pv11GwtNCAz3eSZk5nmDn9kT0qMTQAmtEtj6jYYc4nsw8WI3QYF5ff2AO0BzycmC+cQ ICFAyNCAWPMjDOS+TmhM/13O63SHYoehLvm+4d+NXyHUToN6POZrZLtFYRoYqiEG/C2/ 9TSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:references:cc:from:message-id :date:user-agent:mime-version:in-reply-to; bh=x+6hugWS3tKHJsUqUkVDlrG8PxzFL7BYQpzN0aiOkHw=; b=OkDUOpI2GnWKouflr+T2UGIc1L4MBOHG/3rro611W7x1nx+GLX5dn5PNyTulDZGA3A xjqDodwu+hUWMJCxe2aBXxEw/EOdX56voyLU2v0a2Y1oxuK9e4sO22J/RQ83xm8MtVew 41GcpA+dwPg1nRIwFqopyH9fEeJhhLy+CgQMap3vL+hzkoyDdKRA2sbShtEy8DNhrrYQ XyS33kZFZCOIhhPmdEJtNOPGBkgxtvcMZ3qM96NrLPP38pB8rb1Bn55zlU8wy9peb7mr tbSVWmjHVoq7R98Ky87wCsyDJnyvBqxvCsdyvNbNOiL1HJaJNA6U+LCQn55ayw9yLRAs Hhfg== X-Gm-Message-State: AMke39lO/5mMqZ/QdHb/J2IWLymWYWaJNiJ7c+n/mwFHaxm1XB42VWNpzfeU6Ynyowk6pw== X-Received: by 10.202.7.193 with SMTP id 184mr1390076oih.58.1486233689172; Sat, 04 Feb 2017 10:41:29 -0800 (PST) Received: from linux-4v1g.suse (cpe-24-31-249-175.kc.res.rr.com. [24.31.249.175]) by smtp.gmail.com with ESMTPSA id r41sm16388871otc.40.2017.02.04.10.41.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Feb 2017 10:41:28 -0800 (PST) Subject: Re: rtlwifi: rtl8192c_common: "BUG: KASAN: slab-out-of-bounds" To: Dmitry Osipenko , Chaoming Li References: Cc: linux-wireless@vger.kernel.org, Linux Kernel Mailing List From: Larry Finger Message-ID: Date: Sat, 4 Feb 2017 12:41:27 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 02/04/2017 10:58 AM, Dmitry Osipenko wrote: > Seems the problem is caused by rtl92c_dm_*() casting .priv to "struct > rtl_pci_priv", while it is "struct rtl_usb_priv". Those routines are shared by rtl8192ce and rtl8192cu, thus we need to make that difference in cast to be immaterial. I think we need to move "struct bt_coexist_info" to the beginning of both rtlpci_priv and rtl_usb_priv. Then it should not matter. I do not have a gcc version new enough to turn KASAN testing on, thus the attached patch is only compile tested. Does it fix the problem? Larry diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.h b/drivers/net/wireless/realtek/rtlwifi/pci.h index 578b1d9..d9039ea 100644 --- a/drivers/net/wireless/realtek/rtlwifi/pci.h +++ b/drivers/net/wireless/realtek/rtlwifi/pci.h @@ -271,10 +271,10 @@ struct mp_adapter { }; struct rtl_pci_priv { + struct bt_coexist_info bt_coexist; + struct rtl_led_ctl ledctl; struct rtl_pci dev; struct mp_adapter ndis_adapter; - struct rtl_led_ctl ledctl; - struct bt_coexist_info bt_coexist; }; #define rtl_pcipriv(hw) (((struct rtl_pci_priv *)(rtl_priv(hw))->priv)) diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.h b/drivers/net/wireless/realtek/rtlwifi/usb.h index a6d43d2..cdb9e06 100644 --- a/drivers/net/wireless/realtek/rtlwifi/usb.h +++ b/drivers/net/wireless/realtek/rtlwifi/usb.h @@ -146,8 +146,9 @@ struct rtl_usb { }; struct rtl_usb_priv { - struct rtl_usb dev; + struct bt_coexist_info bt_coexist; struct rtl_led_ctl ledctl; + struct rtl_usb dev; }; #define rtl_usbpriv(hw) (((struct rtl_usb_priv *)(rtl_priv(hw))->priv))