From patchwork Wed Oct 8 17:44:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 5054741 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5F452C11AB for ; Wed, 8 Oct 2014 17:45:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 90BFD201DD for ; Wed, 8 Oct 2014 17:45:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 58842201CD for ; Wed, 8 Oct 2014 17:45:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752846AbaJHRpD (ORCPT ); Wed, 8 Oct 2014 13:45:03 -0400 Received: from mail-oi0-f51.google.com ([209.85.218.51]:49672 "EHLO mail-oi0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750922AbaJHRpB (ORCPT ); Wed, 8 Oct 2014 13:45:01 -0400 Received: by mail-oi0-f51.google.com with SMTP id h136so5625168oig.10 for ; Wed, 08 Oct 2014 10:45:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=csWFxHBi3hvcblawG+YRv/oTOSbQXMbEan67VYSA8qI=; b=EU1jYBrj91L3a6pqjUwFeAy8fMP9+UoF/IXW76VyKD+Zofgn3KrIE/0l8SeyUWvKko mQEvHvXE5tSa4B1Au471PB8lBIEVtPj4k+xH9Jyt6pS/s3JOeY+Im/MoCWeOLNscIxu6 3we0tfmQVFtSMYhsfYa7Kr37hn8bGYFNpT5F+5GQUiGjtCUfFz32vc398uWcRk2lK/pe Mmqwiw9XhRruULDKIGT9smjc/bCvBZnMoUqjaDQavEm7yTUQvwZ/M19OCo0KwdW1c4Hh sgVIcPsWUe5KfVqsQpLnu6aVQ6XhnS9ayR4Bz1HJgZ7h8cqz+STEjHpm/OsoEMDh/pDu PhZA== X-Received: by 10.182.104.104 with SMTP id gd8mr13920361obb.17.1412790301100; Wed, 08 Oct 2014 10:45:01 -0700 (PDT) Received: from linux.site (cpe-69-76-245-152.kc.res.rr.com. [69.76.245.152]) by mx.google.com with ESMTPSA id y5sm434288oet.15.2014.10.08.10.45.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Oct 2014 10:45:00 -0700 (PDT) From: Larry Finger To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, troy_tan@realsil.com.cn, Larry Finger , netdev@vger.kernel.org Subject: [PATCH V3.18] rtlwifi: Fix possible unaligned array in ether_addr_copy() Date: Wed, 8 Oct 2014 12:44:55 -0500 Message-Id: <1412790295-27858-1-git-send-email-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 1.8.4.5 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Two macros used to copy BSSID information use ether_addr_copy(), thus the arrays must be 2-byte aligned. In one case, the array could become unaligned if the struct containing it were changed. Use the __unaligned(2) attribute to retain the necessary alignment. In addition, the magic number used to specify the size of the array is replaced by ETH_ALEN. Signed-off-by: Larry Finger Acked-by: David S. Miller --- drivers/net/wireless/rtlwifi/wifi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h index 976667a..6866dcf 100644 --- a/drivers/net/wireless/rtlwifi/wifi.h +++ b/drivers/net/wireless/rtlwifi/wifi.h @@ -1370,7 +1370,7 @@ struct rtl_mac { bool rdg_en; /*AP*/ - u8 bssid[6]; + u8 bssid[ETH_ALEN] __aligned(2); u32 vendor; u8 mcs[16]; /* 16 bytes mcs for HT rates. */ u32 basic_rates; /* b/g rates */