From nobody Mon May 30 17:04:21 2022 X-Original-To: dev-commits-src-main@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 82D9A1B60930; Mon, 30 May 2022 17:04:22 +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 4LBhbB2ZDrz4klk; Mon, 30 May 2022 17:04:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653930262; 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=0YyP1MUhtkxnliwyGTPsUAwPbK5munTXK7Gc5T8sBiI=; b=TV2J3iqAXoZXstoSU0JpEX/Ccp1iZuw2zAngt3ETHcCLR3PsXYzKVBfOiFGuFWqzzNV9Go JOC75u1gMOxKzQzFfKkM6Z3jjxcrOgnh5WhaaCQI5N0OX2RQoaK5Gv7eYuxxVVQQ81nsr8 4HzA+1hNul1PZiKwHtc4n0flyFJWYavQB92l/8SEHuu3bVhq3o2hMM0ETfpMEpVPlW3eL5 9b3v+uO2w+5UCY5eu78NPRSfROxq6ifjTi05K93maFsosG2pW0x0Aq1Wqa6oXl2gdJBBE6 ZtyddngqoDOmjbtbYL+7hHoY56Sry38Ht9Ah2RkFRxJsWTAnXJn7vAapFu7qgQ== 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 16B241B503; Mon, 30 May 2022 17:04:22 +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 24UH4LHG067876; Mon, 30 May 2022 17:04:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24UH4LYF067875; Mon, 30 May 2022 17:04:21 GMT (envelope-from git) Date: Mon, 30 May 2022 17:04:21 GMT Message-Id: <202205301704.24UH4LYF067875@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 669516a1a16e - main - linux(4): Fix the type of a constant in the signal mask macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 669516a1a16efe51f85ef203c3b93e6db7a3ed51 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653930262; 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=0YyP1MUhtkxnliwyGTPsUAwPbK5munTXK7Gc5T8sBiI=; b=n3GC2G/yBTXWD1m35ATBh8cZV2ZmTxQavO2kZBkyQWucNx5ILZltkPv5Yj8hSlb3A6xQfJ FqZc/zlqHrR3gS7T6INQTLGJSzqCYJUq1l998WIhooR62w00znYCnEIF0mnfP+ovL6QPdE Vbm6Spw04WYm37hcCeokAcBOaMtiaVFwN4n06RYRZ87Nm9B+zLEZrPQ4uMOu728hwjgbTM emn9Zlqz/dU8cfVwAVlEBw06BSAEebxB1nKfmAbZVaHUy4pmRtLFNnuB/SPU8HZNCCJ32c PgY8qbf3x3KhjhqNa8YDOCRxYPtclTV9MThA4hG3zKEDJ6QaZHJiMUSCRQTOlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653930262; a=rsa-sha256; cv=none; b=LDyb41Uu6pXSkG1jt+dHGymYJZcXqA9szHe7NncYaa8bnEs7lT6GaEU3LqeH/o4bSFkYLM +89pFDsVzS6MuTwg8T56A4d3nHO9o4ZkWS2OQg82ts8on0KAMYZFHFsTQfgaSGNTxsYUZF mYU6nRYnVAdUQbRxhKtZixq6ojbo7uoX0ny8CJx4X+rJYIxKLOiNzFmibnzg+BlEcDcI+R 6H/K5vJ8I7WChT0Li0SbEPAtLsLAifSbaWg2mB8oCyiXj+4xFF2SQxbNXn3AmanNTcKXQc 8OAH+H/6odBl0/gfJSekJlxZh57eb9j+4/wQzPFWXHlgadPWx+mDdUqIKBOe+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=669516a1a16efe51f85ef203c3b93e6db7a3ed51 commit 669516a1a16efe51f85ef203c3b93e6db7a3ed51 Author: Dmitry Chagin AuthorDate: 2022-05-30 16:53:52 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-30 16:53:52 +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 --- 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 *);