Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 18 Jul 2017 18:51:34 +0000 (UTC)
From:      Ngie Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r321165 - stable/11/tests/sys/kern
Message-ID:  <201707181851.v6IIpYJs093468@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ngie
Date: Tue Jul 18 18:51:34 2017
New Revision: 321165
URL: https://svnweb.freebsd.org/changeset/base/321165

Log:
  MFC r319063:
  
  Send all of `data`, not just a portion of it
  
  It was sending only a long's worth (4 or 8 bytes) of data previously
  (instead of the entire buffer) via send(2).
  
  CID:		1229966, 1229967, 1230004, 1230005

Modified:
  stable/11/tests/sys/kern/unix_seqpacket_test.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/tests/sys/kern/unix_seqpacket_test.c
==============================================================================
--- stable/11/tests/sys/kern/unix_seqpacket_test.c	Tue Jul 18 18:48:58 2017	(r321164)
+++ stable/11/tests/sys/kern/unix_seqpacket_test.c	Tue Jul 18 18:51:34 2017	(r321165)
@@ -762,7 +762,7 @@ ATF_TC_BODY(shutdown_send, tc)
 	/* ATF's isolation mechanisms will guarantee uniqueness of this file */
 	const char *path = "sock";
 	const char *data = "data";
-	ssize_t ssize;
+	ssize_t datalen, ssize;
 	int s, err, s2;
 
 	s = socket(PF_LOCAL, SOCK_SEQPACKET, 0);
@@ -786,8 +786,9 @@ ATF_TC_BODY(shutdown_send, tc)
 	}
 
 	ATF_CHECK_EQ(0, shutdown(s2, SHUT_RDWR));
+	datalen = strlen(data) + 1;	/* +1 for the null */
 	/* USE MSG_NOSIGNAL so we don't get SIGPIPE */
-	ssize = send(s2, data, sizeof(data), MSG_EOR | MSG_NOSIGNAL);
+	ssize = send(s2, data, datalen, MSG_EOR | MSG_NOSIGNAL);
 	ATF_CHECK_EQ(EPIPE, errno);
 	ATF_CHECK_EQ(-1, ssize);
 	close(s);
@@ -802,6 +803,7 @@ ATF_TC_BODY(shutdown_send_sigpipe, tc)
 	/* ATF's isolation mechanisms will guarantee uniqueness of this file */
 	const char *path = "sock";
 	const char *data = "data";
+	ssize_t datalen;
 	int s, err, s2;
 
 	s = socket(PF_LOCAL, SOCK_SEQPACKET, 0);
@@ -826,7 +828,8 @@ ATF_TC_BODY(shutdown_send_sigpipe, tc)
 
 	ATF_CHECK_EQ(0, shutdown(s2, SHUT_RDWR));
 	ATF_REQUIRE(SIG_ERR != signal(SIGPIPE, shutdown_send_sigpipe_handler));
-	(void)send(s2, data, sizeof(data), MSG_EOR);
+	datalen = strlen(data) + 1;	/* +1 for the null */
+	(void)send(s2, data, sizeof(*data), MSG_EOR);
 	ATF_CHECK_EQ(1, got_sigpipe);
 	close(s);
 	close(s2);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707181851.v6IIpYJs093468>