Skip to content

Commit

Permalink
staging: android: binder: fix sparse warnings
Browse files Browse the repository at this point in the history
Fix sparse warnings by adding __user annotation to stucts.

This patch fixes the the following sparse warnings:

drivers/staging/android/binder.c:1343:76: warning:
	incorrect type in argument 2 (different address spaces)
	drivers/staging/android/binder.c:1343:76:
	expected void [noderef] <asn:1>*ptr
	drivers/staging/android/binder.c:1343:76: got void *binder
drivers/staging/android/binder.c:1567:57: warning:
	incorrect type in argument 2 (different address spaces)
	drivers/staging/android/binder.c:1567:57:
	expected void const [noderef] <asn:1>*from
	drivers/staging/android/binder.c:1567:57:
	got void const *buffer
drivers/staging/android/binder.c:1573:46: warning:
	incorrect type in argument 2 (different address spaces)
	drivers/staging/android/binder.c:1573:46:
	expected void const [noderef] <asn:1>*from
	drivers/staging/android/binder.c:1573:46:
	got void const *offsets
drivers/staging/android/binder.c:1603:76: warning:
	incorrect type in argument 2 (different address spaces)
	drivers/staging/android/binder.c:1603:76:
	expected void [noderef] <asn:1>*ptr
	drivers/staging/android/binder.c:1603:76: got void *binder
drivers/staging/android/binder.c:1605:64: warning:
	incorrect type in argument 2 (different address spaces)
	drivers/staging/android/binder.c:1605:64:
	expected void [noderef] <asn:1>*ptr
	drivers/staging/android/binder.c:1605:64: got void *binder
drivers/staging/android/binder.c:1605:76: warning:
	incorrect type in argument 3 (different address spaces)
	drivers/staging/android/binder.c:1605:76:
	expected void [noderef] <asn:1>*cookie
	drivers/staging/android/binder.c:1605:76: got void *cookie
drivers/staging/android/binder.c:1613:40: error:
	incompatible types in comparison

Signed-off-by: Emil Goode <emilgoode@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Emil Goode authored and Greg Kroah-Hartman committed Apr 24, 2012
1 parent a180c0d commit 78aee0f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/staging/android/binder.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ struct flat_binder_object {

/* 8 bytes of data. */
union {
void *binder; /* local object */
void __user *binder; /* local object */
signed long handle; /* remote object */
};

/* extra data associated with local object */
void *cookie;
void __user *cookie;
};

/*
Expand Down Expand Up @@ -139,9 +139,9 @@ struct binder_transaction_data {
union {
struct {
/* transaction data */
const void *buffer;
const void __user *buffer;
/* offsets from buffer to flat_binder_object structs */
const void *offsets;
const void __user *offsets;
} ptr;
uint8_t buf[8];
} data;
Expand Down

0 comments on commit 78aee0f

Please sign in to comment.