From nobody Thu Dec 28 03:01:07 2023 X-Original-To: dev-commits-src-branches@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 4T0tYw1lpZz551XG; Thu, 28 Dec 2023 03:01:08 +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 4T0tYv6L5zz3YmF; Thu, 28 Dec 2023 03:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703732467; 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=siAo70XflxAeL3TtYkKoUg4J1WD53vAUAJZyydIxoLY=; b=wvIq7POcvCOXxMUI197ROuYggJF915sAayd2mk6zkoIhKwGh3pt5wBvVdcqFrOdxq0JBhr 46iW0pnvN11P5wLerQv3cXBvIW0yJbCMjiesvtDw6LrDJt6we6YH9It+GsUNTWzbpu7om3 aMkOTo15zj0VcfPfgmZsu2tXwt4d+xPorM5sUdkxO6u0pB/MgtAoaPa9Ha101+mMg1IO9W hfc9itoGgwGrnpSbJylumfl6jpympduTLsUYtMiYtX2DJT6u34QH/fUQi6q04lvWJNyqMN S9Lxn12IfBD/XvIMEzStLNYcyLketZSKXJ9v+87YkK1vh0Pe6Gu+DPlzbpGCyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703732467; a=rsa-sha256; cv=none; b=pW2KLY5LrNoVkih4QbADmZxNwXoQeV7DCdG+vu2vtSvDXf1/96K3xS2M1utYE413WTGYMV GIBcZ8cJMJypE4T6Z1dXVCcCl2VoKMZcEdldsQ295zzSKSNfX+VZN0wwIQXIHwuA2GQrlq 10ydAULpjsfud+aaRrIFeoC9N0xnSBGC3+78gux5agpYQ7epMy6oSVleW+JsRWfu/TgqAX ChRzGJdBd9TBtf0yh1F3pEBvq7jPCRhA3KsPNqolEA2ZCydOsTunKQX2nbPdOhcqdb1yas TF7Fr15iNrsS/xDkk6YCoY9sHr9s0sHqU4Hv+Tl8WFflCyFlEGBiC5Ui9RiiUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703732467; 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=siAo70XflxAeL3TtYkKoUg4J1WD53vAUAJZyydIxoLY=; b=bqqXIMDc9jP0hJj9x+FZ7Pjn/wHZ7VKTqHe+Wgs3Zg0NI69t48PzHJufrZy14gzGWJZWtr wv45JCdA4Lh1GMc833KjSEarwBa8Y2IDyPHSkNPLlk0jzhuiL9YpqpyDGJQR9v8Xui51uQ UoNayRHBWRXr0wajtaUTW2qX1qLYbxNM8cwPmu0nxKWxXbextDnKAzLENk6NNSMYc3EddY okGoHwWYIWLpkmgi8k5Db8LTZeWyEStnfPB/waRTkSGZt/nR8q7oH5dG2NqPbklwgnIT2M mcQuqI+IdiRUZuTDJEvQonCHNjZE9OhcOf+ja4eJh3VdL+ZJdr1zgNhC6lD/dw== 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 4T0tYv5QSjz145x; Thu, 28 Dec 2023 03:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BS317T5035701; Thu, 28 Dec 2023 03:01:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BS317tV035698; Thu, 28 Dec 2023 03:01:07 GMT (envelope-from git) Date: Thu, 28 Dec 2023 03:01:07 GMT Message-Id: <202312280301.3BS317tV035698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 137b36455d51 - stable/14 - freebsd32: Fix error handling for suword32() calls List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 137b36455d51f7303166bd4e1625b0bf969b9db5 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=137b36455d51f7303166bd4e1625b0bf969b9db5 commit 137b36455d51f7303166bd4e1625b0bf969b9db5 Author: Mark Johnston AuthorDate: 2023-12-21 16:51:29 +0000 Commit: Mark Johnston CommitDate: 2023-12-28 02:58:47 +0000 freebsd32: Fix error handling for suword32() calls suword32() returns -1 upon an error, not an errno value. MFC after: 1 week (cherry picked from commit bd1654ce92569bbfbe513749db08cdd781b3a036) --- sys/compat/freebsd32/freebsd32_capability.c | 5 +++-- sys/compat/freebsd32/freebsd32_misc.c | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_capability.c b/sys/compat/freebsd32/freebsd32_capability.c index 82db5da5898a..681e511a59de 100644 --- a/sys/compat/freebsd32/freebsd32_capability.c +++ b/sys/compat/freebsd32/freebsd32_capability.c @@ -117,9 +117,10 @@ freebsd32_cap_ioctls_get(struct thread *td, cmds = fdep->fde_ioctls; if (cmds32 != NULL && cmds != NULL) { for (i = 0; i < MIN(fdep->fde_nioctls, maxcmds); i++) { - error = suword32(&cmds32[i], cmds[i]); - if (error != 0) + if (suword32(&cmds32[i], cmds[i]) != 0) { + error = EFAULT; goto out; + } } } if (fdep->fde_nioctls == -1) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 2f5cf95b4e4a..5aafc459d60a 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -2700,9 +2700,8 @@ freebsd32___sysctlbyname(struct thread *td, &oldlen, uap->new, uap->newlen, &rv, SCTL_MASK32, 1); if (error != 0) return (error); - if (uap->oldlenp != NULL) - error = suword32(uap->oldlenp, rv); - + if (uap->oldlenp != NULL && suword32(uap->oldlenp, rv) != 0) + error = EFAULT; return (error); }