From patchwork Tue Mar 16 23:30:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 47910 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 13ED6B7D4F for ; Wed, 17 Mar 2010 10:32:08 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751338Ab0CPXa7 (ORCPT ); Tue, 16 Mar 2010 19:30:59 -0400 Received: from mail.us.es ([193.147.175.20]:59069 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751076Ab0CPXa6 (ORCPT ); Tue, 16 Mar 2010 19:30:58 -0400 Received: (qmail 27439 invoked from network); 17 Mar 2010 00:30:48 +0100 Received: from unknown (HELO us.es) (192.168.2.11) by us.es with SMTP; 17 Mar 2010 00:30:48 +0100 Received: (qmail 2532 invoked by uid 507); 16 Mar 2010 23:30:47 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on antivirus1 X-Spam-Level: * X-Spam-Status: No, score=1.0 required=6.5 tests=BAYES_50, RCVD_IN_PBL, RDNS_NONE autolearn=disabled version=3.2.5 Received: from 127.0.0.1 by antivirus1 (envelope-from , uid 501) with qmail-scanner-2.06 (clamdscan: 0.95.3/10585. Clear:RC:1(127.0.0.1):. Processed in 0.019168 secs); 16 Mar 2010 23:30:47 -0000 Received: from unknown (HELO us.es) (127.0.0.1) by us.es with SMTP; 16 Mar 2010 23:30:46 -0000 Received: (qmail 18678 invoked from network); 17 Mar 2010 00:30:46 +0100 Received: from unknown (HELO ?127.0.1.1?) (pneira@us.es@77.208.78.8) by us.es with (DHE-RSA-AES256-SHA encrypted) SMTP; 17 Mar 2010 00:30:46 +0100 Subject: [PATCH 3/3] netlink: fix unaligned access in nla_get_be64() To: netdev@vger.kernel.org From: Pablo Neira Ayuso Cc: kaber@trash.net, davem@davemloft.net Date: Wed, 17 Mar 2010 00:30:44 +0100 Message-ID: <20100316233044.4185.69099.stgit@decadence> In-Reply-To: <20100316232247.4185.19426.stgit@decadence> References: <20100316232247.4185.19426.stgit@decadence> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch fixes a unaligned access in nla_get_be64() that was introduced by myself in a17c859849402315613a0015ac8fbf101acf0cc1. Signed-off-by: Pablo Neira Ayuso --- include/net/netlink.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/net/netlink.h b/include/net/netlink.h index a63b219..668ad04 100644 --- a/include/net/netlink.h +++ b/include/net/netlink.h @@ -945,7 +945,11 @@ static inline u64 nla_get_u64(const struct nlattr *nla) */ static inline __be64 nla_get_be64(const struct nlattr *nla) { - return *(__be64 *) nla_data(nla); + __be64 tmp; + + nla_memcpy(&tmp, nla, sizeof(tmp)); + + return tmp; } /**