2 files changed, 5 insertions, 6 deletions

diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 6ad070d87702..ad487e8abcc2 100644
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -70,10 +70,9 @@ static inline void msg_set_bits(struct tipc_msg *m, u32 w,
                                 u32 pos, u32 mask, u32 val)
 {
         val = (val & mask) << pos;
-        val = htonl(val);
-        mask = htonl(mask << pos);
-        m->hdr[w] &= ~mask;
-        m->hdr[w] |= val;
+        mask = mask << pos;
+        m->hdr[w] &= ~htonl(mask);
+        m->hdr[w] |= htonl(val);
 }
 
 /*
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 05853159536a..230f9ca2ad6b 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -1756,8 +1756,8 @@ static int getsockopt(struct socket *sock,
         else if (len < sizeof(value)) {
                 res = -EINVAL;
         }
-        else if ((res = copy_to_user(ov, &value, sizeof(value)))) {
-                /* couldn't return value */
+        else if (copy_to_user(ov, &value, sizeof(value))) {
+                res = -EFAULT;
         }
         else {
                 res = put_user(sizeof(value), ol);