Add user pointer annotations to fs/select.c

diff --git a/fs/select.c b/fs/select.c
index ce46b5c90eb590d545a0ad85dae5ee1967d19b51..455eaccaa7338f0fb698d1c9936cdd33b9ce41d8 100644 (file)
--- a/fs/select.c
+++ b/fs/select.c
@@ -268,7 +268,7 @@ static void select_bits_free(void *bits, int size)
        ((unsigned long) (MAX_SCHEDULE_TIMEOUT / HZ)-1)
 
 asmlinkage long
-sys_select(int n, fd_set *inp, fd_set *outp, fd_set *exp, struct timeval *tvp)
+sys_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp, struct timeval __user *tvp)
 {
        fd_set_bits fds;
        char *bits;
@@ -429,7 +429,7 @@ static int do_poll(unsigned int nfds,  struct poll_list *list,
        return count;
 }
 
-asmlinkage long sys_poll(struct pollfd * ufds, unsigned int nfds, long timeout)
+asmlinkage long sys_poll(struct pollfd __user * ufds, unsigned int nfds, long timeout)
 {
        struct poll_wqueues table;
        int fdcount, err;

diff --git a/include/linux/poll.h b/include/linux/poll.h
index 0e4f055588b3ef1d087a644e895222dee84d5c4e..b4bb681fd1ca08c76d4570ef63f281bd7b50f17c 100644 (file)
--- a/include/linux/poll.h
+++ b/include/linux/poll.h
@@ -67,7 +67,7 @@ typedef struct {
  * Use "unsigned long" accesses to let user-mode fd_set's be long-aligned.
  */
 static inline
-int get_fd_set(unsigned long nr, void *ufdset, unsigned long *fdset)
+int get_fd_set(unsigned long nr, void __user *ufdset, unsigned long *fdset)
 {
        nr = FDS_BYTES(nr);
        if (ufdset) {
@@ -82,7 +82,7 @@ int get_fd_set(unsigned long nr, void *ufdset, unsigned long *fdset)
 }
 
 static inline
-void set_fd_set(unsigned long nr, void *ufdset, unsigned long *fdset)
+void set_fd_set(unsigned long nr, void __user *ufdset, unsigned long *fdset)
 {
        if (ufdset)
                __copy_to_user(ufdset, fdset, FDS_BYTES(nr));