2009-03-28 20:03:45

by Måns Rullgård

Subject: [PATCH] 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 <[email protected]>
---
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 <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,
--
1.6.2

2009-03-30 19:41:28

by Chuck Lever III

Subject: Re: [PATCH] NSM: Fix unaligned accesses in nsm_init_private()

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 <[email protected]>

Did a little testing on x86 as well.

> Signed-off-by: Mans Rullgard <[email protected]>
> ---
> 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 <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,
> --
> 1.6.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs"
> in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

--
Chuck Lever
chuck[dot]lever[at]oracle[dot]com