[PATCHv2 1/2] staging: binder: add __user annotation in binder.c

[PATCHv2 1/2] staging: binder: add __user annotation in binder.c

[Mathieu Maret]

Add __user to binder_version and correct sparse warning.
Reduce line size to fit to coding style.

Signed-off-by: Mathieu Maret <mathieu.maret@gmail.com>
---
 drivers/staging/android/binder.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index cfe4bc8..6d8ee37 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -2683,16 +2683,19 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 		binder_free_thread(proc, thread);
 		thread = NULL;
 		break;
-	case BINDER_VERSION:
+	case BINDER_VERSION: {
+		struct binder_version __user *ver = ubuf;
 		if (size != sizeof(struct binder_version)) {
 			ret = -EINVAL;
 			goto err;
 		}
-		if (put_user(BINDER_CURRENT_PROTOCOL_VERSION, &((struct binder_version *)ubuf)->protocol_version)) {
+		if (put_user(BINDER_CURRENT_PROTOCOL_VERSION,
+			&ver->protocol_version)) {
 			ret = -EINVAL;
 			goto err;
 		}
 		break;
+	}
 	default:
 		ret = -EINVAL;
 		goto err;
-- 
1.9.1

[PATCH 2/2] staging: binder: Code simplification

[Mathieu Maret]

Remove duplicate code

Signed-off-by: Mathieu Maret <mathieu.maret@gmail.com>
---
 drivers/staging/android/binder.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 6d8ee37..67aaa38 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -2685,11 +2685,9 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 		break;
 	case BINDER_VERSION: {
 		struct binder_version __user *ver = ubuf;
-		if (size != sizeof(struct binder_version)) {
-			ret = -EINVAL;
-			goto err;
-		}
-		if (put_user(BINDER_CURRENT_PROTOCOL_VERSION,
+
+		if (size != sizeof(struct binder_version) ||
+			put_user(BINDER_CURRENT_PROTOCOL_VERSION,
 			&ver->protocol_version)) {
 			ret = -EINVAL;
 			goto err;
-- 
1.9.1

Re: [PATCH 2/2] staging: binder: Code simplification

[Joe Perches]

On Tue, 2014-03-25 at 23:03 +0100, Mathieu Maret wrote:
> Remove duplicate code
[]
> diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
[]
> @@ -2685,11 +2685,9 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
>  		break;
>  	case BINDER_VERSION: {
>  		struct binder_version __user *ver = ubuf;
> -		if (size != sizeof(struct binder_version)) {
> -			ret = -EINVAL;
> -			goto err;
> -		}
> -		if (put_user(BINDER_CURRENT_PROTOCOL_VERSION,
> +
> +		if (size != sizeof(struct binder_version) ||
> +			put_user(BINDER_CURRENT_PROTOCOL_VERSION,
>  			&ver->protocol_version)) {

When you do this, please align continuations at the appropriate
open parenthesis using maximal initial tabs and minimal spaces
for alignment.

		if (size != sizeof(struct binder_version) ||
		    put_user(BINDER_CURRENT_PROTOCOL_VERSION,
			     &ver->protocol_version)) {

2 tabs then 4 spaces then "put_user"
3 tabs then 5 spaces then "&ver->"

using scripts/checkpatch.pl --strict should alert you to this.

And, either don't submit this until after 3.15-rc1 is out
and Greg KH starts taking patches again, or expect to be
very patient about getting any update on this.

Re: [PATCH 2/2] staging: binder: Code simplification

[Mathieu Maret]

Joe Perches wrote:
> On Tue, 2014-03-25 at 23:03 +0100, Mathieu Maret wrote:
> > Remove duplicate code
> []
> > diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
> []
> > @@ -2685,11 +2685,9 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
> >  		break;
> >  	case BINDER_VERSION: {
> >  		struct binder_version __user *ver = ubuf;
> > -		if (size != sizeof(struct binder_version)) {
> > -			ret = -EINVAL;
> > -			goto err;
> > -		}
> > -		if (put_user(BINDER_CURRENT_PROTOCOL_VERSION,
> > +
> > +		if (size != sizeof(struct binder_version) ||
> > +			put_user(BINDER_CURRENT_PROTOCOL_VERSION,
> >  			&ver->protocol_version)) {
> 
> When you do this, please align continuations at the appropriate
> open parenthesis using maximal initial tabs and minimal spaces
> for alignment.
> 
> 		if (size != sizeof(struct binder_version) ||
> 		    put_user(BINDER_CURRENT_PROTOCOL_VERSION,
> 			     &ver->protocol_version)) {
> 
> 2 tabs then 4 spaces then "put_user"
> 3 tabs then 5 spaces then "&ver->"
> 
> using scripts/checkpatch.pl --strict should alert you to this.
> 
> And, either don't submit this until after 3.15-rc1 is out
> and Greg KH starts taking patches again, or expect to be
> very patient about getting any update on this.
>

Joe,

Thanks for your help and tips.
--strict is now on my todo list !

See you after 3.15-rc1