diff options
| author | Mans Rullgard <mans@mansr.com> | 2009-03-28 22:55:20 +0300 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-04-01 21:24:14 +0400 |
| commit | ad5b365c1266b0c9e8e254a3c1cc4ef66bf33cba (patch) | |
| tree | b7f9bf04da9f08057db4f5e1a88a4b38511e200e | |
| parent | 3c8c45dfab78a1919f6f8a3ea46998c487eb7e12 (diff) | |
| download | linux-ad5b365c1266b0c9e8e254a3c1cc4ef66bf33cba.tar.xz | |
NSM: Fix unaligned accesses in nsm_init_private()
This fixes unaligned accesses in nsm_init_private() when
creating nlm_reboot keys.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
| -rw-r--r-- | 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 5e2c4d5ac827..6d5d4a4169e5 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c @@ -16,6 +16,8 @@ #include <linux/sunrpc/svc.h> #include <linux/lockd/lockd.h> +#include <asm/unaligned.h> + #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, |