summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-02-07 15:35:42 +1100
committerJ. Bruce Fields <bfields@redhat.com>2012-02-17 18:38:51 -0500
commitde5b8e8e047534aac6bc9803f96e7257436aef9c (patch)
treea32c2ccf0e2992f177c0a5db41e6b2b515b603e2
parentcec56c8ff5e28f58ff13041dca7853738ae577a1 (diff)
downloadop-kernel-dev-de5b8e8e047534aac6bc9803f96e7257436aef9c.zip
op-kernel-dev-de5b8e8e047534aac6bc9803f96e7257436aef9c.tar.gz
lockd: fix arg parsing for grace_period and timeout.
If you try to set grace_period or timeout via a module parameter to lockd, and do this on a big-endian machine where sizeof(int) != sizeof(unsigned long) it won't work. This number given will be effectively shifted right by the difference in those two sizes. So cast kp->arg properly to get correct result. Cc: stable@kernel.org Signed-off-by: NeilBrown <neilb@suse.de> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/lockd/svc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index c061b9a..2444780 100644
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -440,7 +440,7 @@ static int param_set_##name(const char *val, struct kernel_param *kp) \
__typeof__(type) num = which_strtol(val, &endp, 0); \
if (endp == val || *endp || num < (min) || num > (max)) \
return -EINVAL; \
- *((int *) kp->arg) = num; \
+ *((type *) kp->arg) = num; \
return 0; \
}
OpenPOWER on IntegriCloud