lockd: fix arg parsing for grace_period and timeout.

Quoted 12 lines · NeilBrown

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.

Signed-off-by NeilBrown <[email protected]>

fs/lockd/svc.c static int param_set_##name(const char *val, struct kernel_param *kp) \ · line 446

Quoted 13 lines

fs/lockd/svc.c +1 -1

index c061b9a..2444780 100644
@@ -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;							\
 }
 

Wow, that's a seriously old bug...

Bruce, do you want to carry it?

Quoted 13 lines · Trond

Quoted 12 lines · NeilBrown

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.

Signed-off-by NeilBrown <[email protected]>

Quoted 14 lines

fs/lockd/svc.c static int param_set_##name(const char *val, struct kernel_param *kp) \ · line 446

Quoted 13 lines

fs/lockd/svc.c +1 -1

index c061b9a..2444780 100644
@@ -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;							\
 }
 

Wow, that's a seriously old bug...

Looking at a historical git repo, it was probably from "[PATCH] make NFS lockd port numbers assignable at run time", attributed to Jamie Lokier in August 2003, in 2.6.0.

Anyway:

Quoted 1 line

Bruce, do you want to carry it?

Sure. I'm a little slow getting stuff pushed out while I track down a couple very tricky bugs, but it should show up in my git tree in a few days....