Module Name: src
Committed By: hannken
Date: Mon Nov 12 09:21:13 UTC 2018
Modified Files:
src/sys/kern: uipc_syscalls.c
Log Message:
sys_recvmmsg: don't defer an error that already gets returned.
To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/sys/kern/uipc_syscalls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/uipc_syscalls.c
diff -u src/sys/kern/uipc_syscalls.c:1.198 src/sys/kern/uipc_syscalls.c:1.199
--- src/sys/kern/uipc_syscalls.c:1.198 Wed Nov 7 09:59:12 2018
+++ src/sys/kern/uipc_syscalls.c Mon Nov 12 09:21:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls.c,v 1.198 2018/11/07 09:59:12 hannken Exp $ */
+/* $NetBSD: uipc_syscalls.c,v 1.199 2018/11/12 09:21:13 hannken Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.198 2018/11/07 09:59:12 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.199 2018/11/12 09:21:13 hannken Exp $");
#ifdef _KERNEL_OPT
#include "opt_pipe.h"
@@ -1124,17 +1124,16 @@ sys_recvmmsg(struct lwp *l, const struct
*retval = dg;
- if (error)
- so->so_rerror = error;
-
- fd_putfile(s);
-
/*
* If we succeeded at least once, return 0, hopefully so->so_rerror
* will catch it next time.
*/
- if (dg)
- return 0;
+ if (error && dg > 0) {
+ so->so_rerror = error;
+ error = 0;
+ }
+
+ fd_putfile(s);
return error;
}
