Module Name: src
Committed By: christos
Date: Sat Sep 14 14:09:54 UTC 2019
Modified Files:
src/sys/kern: uipc_socket.c
Log Message:
PT/54527: Anthony Mallet: Don't clear socket errors for MSG_PEEK.
To generate a diff of this commit:
cvs rdiff -u -r1.281 -r1.282 src/sys/kern/uipc_socket.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_socket.c
diff -u src/sys/kern/uipc_socket.c:1.281 src/sys/kern/uipc_socket.c:1.282
--- src/sys/kern/uipc_socket.c:1.281 Tue Jul 16 18:57:55 2019
+++ src/sys/kern/uipc_socket.c Sat Sep 14 10:09:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket.c,v 1.281 2019/07/16 22:57:55 pgoyette Exp $ */
+/* $NetBSD: uipc_socket.c,v 1.282 2019/09/14 14:09:54 christos Exp $ */
/*
* Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.281 2019/07/16 22:57:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.282 2019/09/14 14:09:54 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -928,7 +928,8 @@ sosend(struct socket *so, struct sockadd
}
if (so->so_error) {
error = so->so_error;
- so->so_error = 0;
+ if ((flags & MSG_PEEK) == 0)
+ so->so_error = 0;
goto release;
}
if ((so->so_state & SS_ISCONNECTED) == 0) {
@@ -1225,15 +1226,13 @@ restart:
panic("receive 1");
#endif
if (so->so_error || so->so_rerror) {
+ u_short *e;
if (m != NULL)
goto dontblock;
- if (so->so_error) {
- error = so->so_error;
- so->so_error = 0;
- } else {
- error = so->so_rerror;
- so->so_rerror = 0;
- }
+ *e = so->so_error ? &so->so_error : &so->so_rerror;
+ error = *e;
+ if ((flags & MSG_PEEK) == 0)
+ *e = 0;
goto release;
}
if (so->so_state & SS_CANTRCVMORE) {
