FROMLIST: arm64: dts: rockchip: rk3368 swap clust0 and clust1

[firefly-linux-kernel-4.4.55.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 1f69e48b15014405f96f53cf58f37ff2524ce3ba..1489761b371e8d3b6bd0a8e036dd25fb74264f79 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -2199,8 +2199,10 @@ int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
                return err;
 
        err = sock_error(sock->sk);
-       if (err)
+       if (err) {
+               datagrams = err;
                goto out_put;
+       }
 
        entry = mmsg;
        compat_entry = (struct compat_mmsghdr __user *)mmsg;