1 files changed, 3 insertions, 2 deletions

diff --git a/net/socket.c b/net/socket.c
index bf2122691fba..ad22df1ffbd1 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -1916,7 +1916,7 @@ static int copy_msghdr_from_user(struct msghdr *kmsg,
         if (copy_from_user(&msg, umsg, sizeof(*umsg)))
                 return -EFAULT;
 
-        kmsg->msg_control = msg.msg_control;
+        kmsg->msg_control = (void __force *)msg.msg_control;
         kmsg->msg_controllen = msg.msg_controllen;
         kmsg->msg_flags = msg.msg_flags;
 
@@ -1935,7 +1935,8 @@ static int copy_msghdr_from_user(struct msghdr *kmsg,
 
         if (msg.msg_name && kmsg->msg_namelen) {
                 if (!save_addr) {
-                        err = move_addr_to_kernel(msg.msg_name, kmsg->msg_namelen,
+                        err = move_addr_to_kernel(msg.msg_name,
+                                                  kmsg->msg_namelen,
                                                   kmsg->msg_name);
                         if (err < 0)
                                 return err;