From: Chuck Lever Subject: Re: [PATCH] NSM: Fix unaligned accesses in nsm_init_private() Date: Mon, 30 Mar 2009 15:40:49 -0400 Message-ID: <56E66BF1-FBC8-4727-AB62-3BF2A97979F1@oracle.com> References: <1238270120-31501-1-git-send-email-mans@mansr.com> Mime-Version: 1.0 (Apple Message framework v930.3) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Cc: linux-kernel@vger.kernel.org, linux-nfs@vger.kernel.org To: Mans Rullgard Return-path: In-Reply-To: <1238270120-31501-1-git-send-email-mans@mansr.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: On Mar 28, 2009, at 3:55 PM, Mans Rullgard wrote: > This fixes unaligned accesses in nsm_init_private() when > creating nlm_reboot keys. > Reviewed-by: Chuck Lever Did a little testing on x86 as well. > Signed-off-by: Mans Rullgard > --- > fs/lockd/mon.c | 8 ++++++-- > 1 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c > index 5e2c4d5..6d5d4a4 100644 > --- a/fs/lockd/mon.c > +++ b/fs/lockd/mon.c > @@ -16,6 +16,8 @@ > #include > #include > > +#include > + > #define NLMDBG_FACILITY NLMDBG_MONITOR > #define NSM_PROGRAM 100024 > #define NSM_VERSION 1 > @@ -274,10 +276,12 @@ static void nsm_init_private(struct nsm_handle > *nsm) > { > u64 *p = (u64 *)&nsm->sm_priv.data; > struct timespec ts; > + s64 ns; > > ktime_get_ts(&ts); > - *p++ = timespec_to_ns(&ts); > - *p = (unsigned long)nsm; > + ns = timespec_to_ns(&ts); > + put_unaligned(ns, p); > + put_unaligned((unsigned long)nsm, p + 1); > } > > static struct nsm_handle *nsm_create_handle(const struct sockaddr > *sap, > -- > 1.6.2 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-nfs" > in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Chuck Lever chuck[dot]lever[at]oracle[dot]com