|
@@ -2244,31 +2244,31 @@ int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
|
|
cond_resched();
|
|
cond_resched();
|
|
}
|
|
}
|
|
|
|
|
|
-out_put:
|
|
|
|
- fput_light(sock->file, fput_needed);
|
|
|
|
-
|
|
|
|
if (err == 0)
|
|
if (err == 0)
|
|
- return datagrams;
|
|
|
|
|
|
+ goto out_put;
|
|
|
|
|
|
- if (datagrams != 0) {
|
|
|
|
|
|
+ if (datagrams == 0) {
|
|
|
|
+ datagrams = err;
|
|
|
|
+ goto out_put;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /*
|
|
|
|
+ * We may return less entries than requested (vlen) if the
|
|
|
|
+ * sock is non block and there aren't enough datagrams...
|
|
|
|
+ */
|
|
|
|
+ if (err != -EAGAIN) {
|
|
/*
|
|
/*
|
|
- * We may return less entries than requested (vlen) if the
|
|
|
|
- * sock is non block and there aren't enough datagrams...
|
|
|
|
|
|
+ * ... or if recvmsg returns an error after we
|
|
|
|
+ * received some datagrams, where we record the
|
|
|
|
+ * error to return on the next call or if the
|
|
|
|
+ * app asks about it using getsockopt(SO_ERROR).
|
|
*/
|
|
*/
|
|
- if (err != -EAGAIN) {
|
|
|
|
- /*
|
|
|
|
- * ... or if recvmsg returns an error after we
|
|
|
|
- * received some datagrams, where we record the
|
|
|
|
- * error to return on the next call or if the
|
|
|
|
- * app asks about it using getsockopt(SO_ERROR).
|
|
|
|
- */
|
|
|
|
- sock->sk->sk_err = -err;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- return datagrams;
|
|
|
|
|
|
+ sock->sk->sk_err = -err;
|
|
}
|
|
}
|
|
|
|
+out_put:
|
|
|
|
+ fput_light(sock->file, fput_needed);
|
|
|
|
|
|
- return err;
|
|
|
|
|
|
+ return datagrams;
|
|
}
|
|
}
|
|
|
|
|
|
SYSCALL_DEFINE5(recvmmsg, int, fd, struct mmsghdr __user *, mmsg,
|
|
SYSCALL_DEFINE5(recvmmsg, int, fd, struct mmsghdr __user *, mmsg,
|