From owner-svn-src-projects@freebsd.org Sat Mar 16 03:03:26 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 32B1B153CF77 for ; Sat, 16 Mar 2019 03:03:26 +0000 (UTC) (envelope-from ngie@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 C5F946A2EA; Sat, 16 Mar 2019 03:03:25 +0000 (UTC) (envelope-from ngie@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 B48911BE88; Sat, 16 Mar 2019 03:03:25 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2G33PXu067206; Sat, 16 Mar 2019 03:03:25 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2G33PRT067205; Sat, 16 Mar 2019 03:03:25 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201903160303.x2G33PRT067205@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Sat, 16 Mar 2019 03:03:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r345214 - projects/capsicum-test/contrib/capsicum-test X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/capsicum-test/contrib/capsicum-test X-SVN-Commit-Revision: 345214 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C5F946A2EA X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.945,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Mar 2019 03:03:26 -0000 Author: ngie Date: Sat Mar 16 03:03:25 2019 New Revision: 345214 URL: https://svnweb.freebsd.org/changeset/base/345214 Log: Fix a -Wcast-align issue by using memcpy to save/restore the value from `CMSG_DATA(..)` Modified: projects/capsicum-test/contrib/capsicum-test/capability-fd.cc Modified: projects/capsicum-test/contrib/capsicum-test/capability-fd.cc ============================================================================== --- projects/capsicum-test/contrib/capsicum-test/capability-fd.cc Fri Mar 15 23:55:41 2019 (r345213) +++ projects/capsicum-test/contrib/capsicum-test/capability-fd.cc Sat Mar 16 03:03:25 2019 (r345214) @@ -982,12 +982,14 @@ FORK_TEST_ON(Capability, SocketTransfer, TmpFile("cap_ // Child: enter cap mode EXPECT_OK(cap_enter()); + int cap_fd; + // Child: wait to receive FD over socket int rc = recvmsg(sock_fds[0], &mh, 0); EXPECT_OK(rc); EXPECT_LE(CMSG_LEN(sizeof(int)), mh.msg_controllen); cmptr = CMSG_FIRSTHDR(&mh); - int cap_fd = *(int*)CMSG_DATA(cmptr); + memcpy(&cap_fd, CMSG_DATA(cmptr), sizeof(int)); EXPECT_EQ(CMSG_LEN(sizeof(int)), cmptr->cmsg_len); cmptr = CMSG_NXTHDR(&mh, cmptr); EXPECT_TRUE(cmptr == NULL); @@ -1022,7 +1024,7 @@ FORK_TEST_ON(Capability, SocketTransfer, TmpFile("cap_ cmptr->cmsg_level = SOL_SOCKET; cmptr->cmsg_type = SCM_RIGHTS; cmptr->cmsg_len = CMSG_LEN(sizeof(int)); - *(int *)CMSG_DATA(cmptr) = cap_fd; + memcpy(CMSG_DATA(cmptr), &cap_fd, sizeof(int)); buffer1[0] = 0; iov[0].iov_len = 1; sleep(3);