From nobody Fri Jun 17 19:41:28 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AD9C585DC61; Fri, 17 Jun 2022 19:41:29 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPqD85jXxz3jGY; Fri, 17 Jun 2022 19:41:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=guiKgp6B/kyLJ4SCJClts30XGwmdZoyCD1FtGv0p258=; b=pKu7ehJhdy774c34kUfHUAC4Ybnl3t9mk+lfmk6O8b38v51OwtbzpcZgiIKK6KcFXiitxf dqxdw3Cp2lzGs0ecDAS1YN/AxwPQuupVpftvwhBVavMnfXKFpSos9MOCNfKc1rQ02HoHQ4 6O947A5eow3QFmRs6/Nm9c5+pOI7Xm8ogFmMHlRITeLgNcXAb8w2Dg0NSWBx4hQ6t+LI7Y cY/Q9WFmcDCcqZ84VVfGY7etnUgGGPZjFJDMARltBL67gcoCLsp+dR+uwAx2J8U2wKPdgf qXVVFnxJOrGsx6wkK97AycJey2Mv3h9UGFTVTb0HPdjzbXdOcHlnuz8vXxfiwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 60B7B259E7; Fri, 17 Jun 2022 19:41:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25HJfSu2030515; Fri, 17 Jun 2022 19:41:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJfS0P030514; Fri, 17 Jun 2022 19:41:28 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:41:28 GMT Message-Id: <202206171941.25HJfS0P030514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 553fb2c65417 - stable/13 - linux(4): Fix the type of a constant in the signal mask macro List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 553fb2c65417b421866eba0f77d686e57338bbb0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=guiKgp6B/kyLJ4SCJClts30XGwmdZoyCD1FtGv0p258=; b=Klc+L5oP3tIo5HAyCjRH/27WhXeITCY/QUUO/6W4eMINvhJSwbWQYbbmHNN5QXxxCgkRwh 8slSpX7jeiLalz54tJTfid0VxOf+84MY3IrXt23AD2Us+KSV2+a19TI2E6+lR8D1XO46zX NKdXe3JvwQy9RWbvnpwRN0YjRJ0YwVK28Me3EdIIRysR2DgHyT2h28YLdkTstj6J+LrX4d lNIxbjTbodCcLg7Qp4XMKtb49NaclmdhYqoAxv1K4MCAhtzVqoXiYY6AE9m2TfRjgu5n2t 5GrXkDUxQpwObGlAFn+IAdkYXsnFGuPNiMnnMwd788RffM/yGOHMHv1j5sc4tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494889; a=rsa-sha256; cv=none; b=HCSBmdb6yjlVOaFuCGnpPKGItoa+ikzrQ7zNSguQEOOA9lDCO2pF+YORLOCq2ag4DAPODg xARvmgykoDs3dcvin3i8GTb3AgKrVmRSo7I4CSjvqRDPmj6mBAyKd3FEnG5oD4aOfsjFeC 85z/ROMBLMHkBpQEwsQXjoopevwHIVwMvKvzgFakD/I8cgzwbaMCRvRELrB0cfmRH8N4wy w7H1RDDlLzgdq7uSDF1IF6NJ8lRDk/qWTkpx1NChVnWJdOPxnrztRcEJYaaUr9kqVauFCN y1s3FvHoI/wo+op1ysC3NbLKAryQ/9F3+1XVbAFDYZydca/tBQAqpBSp8wfA6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=553fb2c65417b421866eba0f77d686e57338bbb0 commit 553fb2c65417b421866eba0f77d686e57338bbb0 Author: Dmitry Chagin AuthorDate: 2022-05-30 16:53:52 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:39 +0000 linux(4): Fix the type of a constant in the signal mask macro Since l_sigset_t is 64-bit unsigned on all Linuxulators, fix the type of a constant in the signal mask manipulation macro. The suffix L indicates type long which is 32-bit on i386, therefore, bitwise operations between a 32-bit constant and 64-bit signal mask lead to the wrong result. Pointy hat to: dchagin MFC after: 2 weeks (cherry picked from commit 669516a1a16efe51f85ef203c3b93e6db7a3ed51) --- sys/compat/linux/linux.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux.h b/sys/compat/linux/linux.h index 0309c4dbaaa8..cf250e29d278 100644 --- a/sys/compat/linux/linux.h +++ b/sys/compat/linux/linux.h @@ -118,8 +118,8 @@ typedef struct { /* primitives to manipulate sigset_t */ #define LINUX_SIGEMPTYSET(set) (set).__mask = 0 -#define LINUX_SIGISMEMBER(set, sig) (1UL & ((set).__mask >> _SIG_IDX(sig))) -#define LINUX_SIGADDSET(set, sig) (set).__mask |= 1UL << _SIG_IDX(sig) +#define LINUX_SIGISMEMBER(set, sig) (1ULL & ((set).__mask >> _SIG_IDX(sig))) +#define LINUX_SIGADDSET(set, sig) (set).__mask |= 1ULL << _SIG_IDX(sig) void linux_to_bsd_sigset(l_sigset_t *, sigset_t *); void bsd_to_linux_sigset(sigset_t *, l_sigset_t *);