Browse Source

orangefs: specify user pointers when using dev_map_desc and bufmap

Sparse lead me to the dev_map_desc one and Al Viro lead me to the bufmap
one.

Signed-off-by: Mike Marshall <hubcap@omnibond.com>
Mike Marshall 7 years ago
parent
commit
817e9b4d9e
2 changed files with 2 additions and 2 deletions
  1. 1 1
      fs/orangefs/orangefs-bufmap.c
  2. 1 1
      fs/orangefs/protocol.h

+ 1 - 1
fs/orangefs/orangefs-bufmap.c

@@ -138,7 +138,7 @@ static int get(struct slot_map *m)
 
 
 /* used to describe mapped buffers */
 /* used to describe mapped buffers */
 struct orangefs_bufmap_desc {
 struct orangefs_bufmap_desc {
-	void *uaddr;			/* user space address pointer */
+	void __user *uaddr;		/* user space address pointer */
 	struct page **page_array;	/* array of mapped pages */
 	struct page **page_array;	/* array of mapped pages */
 	int array_count;		/* size of above arrays */
 	int array_count;		/* size of above arrays */
 	struct list_head list_link;
 	struct list_head list_link;

+ 1 - 1
fs/orangefs/protocol.h

@@ -342,7 +342,7 @@ enum {
  * that may be 32 bit!
  * that may be 32 bit!
  */
  */
 struct ORANGEFS_dev_map_desc {
 struct ORANGEFS_dev_map_desc {
-	void *ptr;
+	void __user *ptr;
 	__s32 total_size;
 	__s32 total_size;
 	__s32 size;
 	__s32 size;
 	__s32 count;
 	__s32 count;