[PATCH] select() warning fixes

[firefly-linux-kernel-4.4.55.git] / fs / select.c

diff --git a/fs/select.c b/fs/select.c
index b3a3a1326af66e63505860cef77c8ae343ebc55a..fce0fd1bb1d1210feeda5fbb328c064c5ca007f9 100644 (file)
--- a/fs/select.c
+++ b/fs/select.c
@@ -310,11 +310,11 @@ static int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp,
                           fd_set __user *exp, s64 *timeout)
 {
        fd_set_bits fds;
-       char *bits;
+       void *bits;
        int ret, size, max_fdset;
        struct fdtable *fdt;
        /* Allocate small arguments on the stack to save memory and be faster */
-       char stack_fds[SELECT_STACK_ALLOC];
+       long stack_fds[SELECT_STACK_ALLOC/sizeof(long)];
 
        ret = -EINVAL;
        if (n < 0)
@@ -341,12 +341,12 @@ static int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp,
                bits = kmalloc(6 * size, GFP_KERNEL);
        if (!bits)
                goto out_nofds;
-       fds.in      = (unsigned long *)  bits;
-       fds.out     = (unsigned long *) (bits +   size);
-       fds.ex      = (unsigned long *) (bits + 2*size);
-       fds.res_in  = (unsigned long *) (bits + 3*size);
-       fds.res_out = (unsigned long *) (bits + 4*size);
-       fds.res_ex  = (unsigned long *) (bits + 5*size);
+       fds.in      = bits;
+       fds.out     = bits +   size;
+       fds.ex      = bits + 2*size;
+       fds.res_in  = bits + 3*size;
+       fds.res_out = bits + 4*size;
+       fds.res_ex  = bits + 5*size;
 
        if ((ret = get_fd_set(n, inp, fds.in)) ||
            (ret = get_fd_set(n, outp, fds.out)) ||
@@ -639,8 +639,10 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds, s64 *timeout)
        struct poll_list *walk;
        struct fdtable *fdt;
        int max_fdset;
-       /* Allocate small arguments on the stack to save memory and be faster */
-       char stack_pps[POLL_STACK_ALLOC];
+       /* Allocate small arguments on the stack to save memory and be
+          faster - use long to make sure the buffer is aligned properly
+          on 64 bit archs to avoid unaligned access */
+       long stack_pps[POLL_STACK_ALLOC/sizeof(long)];
        struct poll_list *stack_pp = NULL;
 
        /* Do a sanity check on nfds ... */