From nobody Mon May 30 17:04:25 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 7C7DD1B60B7A; Mon, 30 May 2022 17:04:26 +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 4LBhbF40ttz4knl; Mon, 30 May 2022 17:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653930265; 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=cDjWG295TtWJe/DPsuL3c7+hDcVF7S/OHqQv8l8JxO4=; b=kMN6HtsuvjrSoCY66K5POi0dWKnDvRgFQ7pBpjRBSCNtHVt4MTFULN4Aj5h9yBDp7OsjPy TXYMgTXlLionvT31Sr8ftOsi/AgtfJvNQp5DS1mAWUPi8EUwI74ZNNRUNQzD8/M0NfPY8H OeEVBmp4DtYz8bKSXCn7ky8EWn4ohYbrlPlpqFDhwg+VdkE2svyWICnBLmdhpfu8qyA3ln zKL7MQpcYkKoW4/hqX0XJMU+5/ldMn3BCMbZuuFvfPuXue/PM5c6dpeRxn8LEEHIJb1bEh j2NQzcRt2R/qchQznmRUPY+BMry5Ul5P4bE1iDbpHHDVyD244BKdUcpJhHxqnQ== 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 5B7A41B504; Mon, 30 May 2022 17:04:25 +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 24UH4PKW067954; Mon, 30 May 2022 17:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24UH4PDc067953; Mon, 30 May 2022 17:04:25 GMT (envelope-from git) Date: Mon, 30 May 2022 17:04:25 GMT Message-Id: <202205301704.24UH4PDc067953@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: 5573143777dd - main - linux(4): Error is not a bool, use proper comparison 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/main X-Git-Reftype: branch X-Git-Commit: 5573143777dd45d77163e208dc54426ac93896af Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653930265; 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=cDjWG295TtWJe/DPsuL3c7+hDcVF7S/OHqQv8l8JxO4=; b=AEneVUbK8nVnuf5ejvUu20hRDxDm3JMUnUuoXxBJZXt+r5C3LOv8SLGbgjbKg4gm2uuWk+ 8IsYpESfmSk9ZNP/LvmOB7yRV6AMciGEzH3xqa3NVxjvZ7YYYSH38RGfh6THD02ok+mP7t RrIWmAb7aMngoizEAXa0TvvsqU79tJinmKNum2vfe0NpFa2AAkJ9/faDe8uEK2iP/Foj8P krO75KksECo0ktfookKwKUYwGb23LKUbmNU/Vewtw4U/jyt5U+6Vh1CRuGia/GaDq+fw8X Thd2iUvU7H/W+s6+nyxEQ79V/jqvd/Qzs1k4LHKYprDAMgX5/4+paV4RHkYHWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653930265; a=rsa-sha256; cv=none; b=sOMRS9I2hvhLPu3BuaRfUes7Eoyc/WUYNFgm0+5YaFPQ8LqeIyvys7HrO7K+PYyzI9kQYV 3USECKDj2hskE6Ts+Lh232U6ktPCAlLMpEGawr0DXDl+9MqBS1978lCZm1bFAwaxkPt7tb VymnBsKFkAWtX3lLlfa5OjDfIpVr1lVkrs3PP7Ajhi+HjXca5nsqtdv1C5PU86FSr6J89e PlGh4/RXTjCNrKqMpD5j5qSOh0NyCXlFE2KvuA7G/lEvf23Y0LqFET9X4ytW1C2kvKVEtY yUbsVCfPlO1QTYIe3XFSfkYqeoNKJi+3VeAOnoi0qye5YpVn46fR/hymS3JWWA== 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=5573143777dd45d77163e208dc54426ac93896af commit 5573143777dd45d77163e208dc54426ac93896af Author: Dmitry Chagin AuthorDate: 2022-05-30 17:00:30 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-30 17:00:30 +0000 linux(4): Error is not a bool, use proper comparison MFC afer: 2 weeks --- sys/compat/linux/linux_signal.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index a5f5d86d8c5d..7dab6b6775ee 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -181,7 +181,7 @@ linux_do_sigaction(struct thread *td, int linux_sig, l_sigaction_t *linux_nsa, sig = linux_to_bsd_signal(linux_sig); error = kern_sigaction(td, sig, nsa, osa, 0); - if (error) + if (error != 0) return (error); if (linux_osa != NULL) @@ -250,7 +250,7 @@ linux_rt_sigaction(struct thread *td, struct linux_rt_sigaction_args *args) if (args->act != NULL) { error = copyin(args->act, &nsa, sizeof(l_sigaction_t)); - if (error) + if (error != 0) return (error); } @@ -258,9 +258,8 @@ linux_rt_sigaction(struct thread *td, struct linux_rt_sigaction_args *args) args->act ? &nsa : NULL, args->oact ? &osa : NULL); - if (args->oact != NULL && !error) { + if (args->oact != NULL && error == 0) error = copyout(&osa, args->oact, sizeof(l_sigaction_t)); - } return (error); } @@ -305,7 +304,7 @@ linux_sigprocmask(struct thread *td, struct linux_sigprocmask_args *args) if (args->mask != NULL) { error = copyin(args->mask, &mask, sizeof(l_osigset_t)); - if (error) + if (error != 0) return (error); LINUX_SIGEMPTYSET(lset); lset.__mask = mask; @@ -316,7 +315,7 @@ linux_sigprocmask(struct thread *td, struct linux_sigprocmask_args *args) args->mask ? &set : NULL, args->omask ? &oset : NULL); - if (args->omask != NULL && !error) { + if (args->omask != NULL && error == 0) { mask = oset.__mask; error = copyout(&mask, args->omask, sizeof(l_osigset_t)); } @@ -340,9 +339,8 @@ linux_rt_sigprocmask(struct thread *td, struct linux_rt_sigprocmask_args *args) error = linux_do_sigprocmask(td, args->how, pset, args->omask ? &oset : NULL); - if (args->omask != NULL && !error) { + if (args->omask != NULL && error == 0) error = copyout(&oset, args->omask, sizeof(l_sigset_t)); - } return (error); } @@ -457,7 +455,7 @@ linux_common_rt_sigtimedwait(struct thread *td, l_sigset_t *mask, ksiginfo_init(&ksi); error = kern_sigtimedwait(td, bset, &ksi, tsa); - if (error) + if (error != 0) return (error); sig = bsd_to_linux_signal(ksi.ksi_signo);