From owner-svn-src-user@freebsd.org Sun Dec 8 06:34:36 2019 Return-Path: Delivered-To: svn-src-user@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5DAF31DA223 for ; Sun, 8 Dec 2019 06:34:36 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47VxPm1ntSz3DQy; Sun, 8 Dec 2019 06:34:36 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1E86A26229; Sun, 8 Dec 2019 06:34:36 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB86Ya1e092553; Sun, 8 Dec 2019 06:34:36 GMT (envelope-from pho@FreeBSD.org) Received: (from pho@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB86YZuh092552; Sun, 8 Dec 2019 06:34:35 GMT (envelope-from pho@FreeBSD.org) Message-Id: <201912080634.xB86YZuh092552@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pho set sender to pho@FreeBSD.org using -f From: Peter Holm Date: Sun, 8 Dec 2019 06:34:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r355524 - user/pho/stress2/misc X-SVN-Group: user X-SVN-Commit-Author: pho X-SVN-Commit-Paths: user/pho/stress2/misc X-SVN-Commit-Revision: 355524 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Dec 2019 06:34:36 -0000 Author: pho Date: Sun Dec 8 06:34:35 2019 New Revision: 355524 URL: https://svnweb.freebsd.org/changeset/base/355524 Log: Added a regression test. Added: user/pho/stress2/misc/sendmsg2.sh (contents, props changed) Added: user/pho/stress2/misc/sendmsg2.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/pho/stress2/misc/sendmsg2.sh Sun Dec 8 06:34:35 2019 (r355524) @@ -0,0 +1,145 @@ +#!/bin/sh + +# +# Test scenario by Tanaka Akira +# from Bug 131876 - [socket] FD leak by receiving SCM_RIGHTS by recvmsg with +# small control message buffer +# Fixed by 337423 + +# $FreeBSD$ + +. ../default.cfg + +dir=/tmp +odir=`pwd` +cd $dir +sed '1,/^EOF/d' < $odir/$0 > $dir/sendmsg2.c +mycc -o sendmsg2 -Wall -Wextra -O0 -g sendmsg2.c || exit 1 +rm -f sendmsg2.c +cd $odir + +start=`date +%s` +/tmp/sendmsg2 & +while [ $((`date +%s` - start)) -lt 300 ]; do + kill -0 $! > /dev/null 2>&1 || break + sleep 2 +done +if kill -0 $! > /dev/null 2>&1; then + echo FAIL + ps -lp $! + procstat -k $! + kill -9 $! +fi +while pkill sendmsg2; do :; done +wait +s=$? +rm -f /tmp/sendmsg2 +exit $s +EOF +#include +#include +#include + +#include +#include +#include +#include + +#define MAX_FDS 10 +#define SEND_FDS 10 +#define RECV_FDS 3 + +void +test(void) +{ + struct msghdr msg; + struct iovec iov; + union { + struct cmsghdr header; + char bytes[CMSG_SPACE(sizeof(int)*MAX_FDS)]; + } cmsg; + struct cmsghdr *cmh = &cmsg.header, *c; + int *fds; + int i; + int ret; + int sv[2]; + char buf[1024]; + char cmdline[1024]; + + snprintf(cmdline, sizeof(cmdline), "fstat -p %u", (unsigned)getpid()); + + ret = socketpair(PF_UNIX, SOCK_STREAM, 0, sv); + if (ret == -1) { perror("socketpair"); exit(1); } + + iov.iov_base = "a"; + iov.iov_len = 1; + + cmh->cmsg_len = CMSG_LEN(sizeof(int)*SEND_FDS); + cmh->cmsg_level = SOL_SOCKET; + cmh->cmsg_type = SCM_RIGHTS; + fds = (int *)CMSG_DATA(cmh); + for (i = 0; i < SEND_FDS; i++) { + fds[i] = 0; /* stdin */ + } + + msg.msg_name = NULL; + msg.msg_namelen = 0; + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + msg.msg_control = cmh; + msg.msg_controllen = CMSG_SPACE(sizeof(int)*SEND_FDS); + msg.msg_flags = 0; + + ret = sendmsg(sv[0], &msg, 0); + if (ret == -1) { perror("sendmsg"); exit(1); } + + + iov.iov_base = buf; + iov.iov_len = sizeof(buf); + + msg.msg_name = NULL; + msg.msg_namelen = 0; + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + msg.msg_control = cmh; + msg.msg_controllen = CMSG_SPACE(sizeof(int)*RECV_FDS); + msg.msg_flags = 0; + +#if defined(DEBUG) + printf("before recvmsg: msg_controllen=%d\n", msg.msg_controllen); +#endif + + ret = recvmsg(sv[1], &msg, 0); + if (ret == -1) { perror("sendmsg"); exit(1); } + +#if defined(DEBUG) + printf("after recvmsg: msg_controllen=%d\n", msg.msg_controllen); +#endif + + for (c = CMSG_FIRSTHDR(&msg); c != NULL; c = CMSG_NXTHDR(&msg, c)) { + if (c->cmsg_len == 0) { printf("cmsg_len is zero\n"); exit(1); } + if (c->cmsg_level == SOL_SOCKET && c->cmsg_type == SCM_RIGHTS) { + int *fdp, *end; + printf("cmsg_len=%d\n", c->cmsg_len); + fdp = (int *)CMSG_DATA(c); + end = (int *)((char *)c + c->cmsg_len); + for (i = 0; fdp+i < end; i++) { + printf("fd[%d]=%d\n", i, fdp[i]); + } + } + } + /* Note the missing sockets close */ +} + +int +main(void) +{ + time_t start; + + alarm(600); + start = time(NULL); + while (time(NULL) - start < 300) + test(); + + return (0); +}