From nobody Thu Dec 21 13:43:48 2023 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 4Sws8h421Cz54pZZ; Thu, 21 Dec 2023 13:43:48 +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 4Sws8h2Wz7z4Nv8; Thu, 21 Dec 2023 13:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703166228; 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=oXnjtu7A64q7FVmJNhyulKJObsXH2WnMqvEUbGT1nh8=; b=kUU88HLqka4rME/AvWaEQmaKiC781IXAgTyHmyJEEj6fYGStrLdGlyYPzuR+Fc+hc5vYPl Rw4HBs8L5Tlyr8dSTyaUrbxuFIBWBd53UpYpINYI7JZ4fii3v86ra3FBf8FnwSDWfaiFJA 9/JTo8NKYlfdGOhob7jpHHrbJQA5CBHg5+UaK3V6hWnSU5GT7OCIEFzNsJJMMwYPBBxdlY QVbGIoA+JwOa2Ib837rx0AiD1zRLp55uHrtf8DsQwV4Bc/xJ8EsxzTWIeKlIu+kXJYBg5b 0Vs2XJAKFkyS0ibnzA6/wJynpBouSJRKdQW2/+t1cTwF3tTGA5TBJhyKkatHdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703166228; a=rsa-sha256; cv=none; b=WLg200vsYOLBg4omw8UOBrwUAZmEJH2HYJ5tOKiG9mIWg3zIMYGHkTCaTD/oHLRcYSbGN4 4Cc48Z9GPxJfy6iaOj9Tj8faNg8hf3dufRgB7oDFDOGcY/oyPnnNoEonPkgzJDmCh8IcnG bo9poTrzcHlrlXZA+G621u6e76njwVkkZgvE3VuG9igxse3lU+CzuXpUBcfhos/Sn8VozO XwxswLBxIbkw7ghNuiygiHJTI8N5vuT83ODCwVpe0Se//gKnbLx6pwsPIxjA9iu2vuOaLc 9HxI9GYGGhBldZHF8xoNlOEl2OmHWxbjxi9Zuvc5PxpSfEekjlLTW64vIyeI5w== 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=1703166228; 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=oXnjtu7A64q7FVmJNhyulKJObsXH2WnMqvEUbGT1nh8=; b=P0GX0CekAIUBsmhOaDkMP3PHk+1PdiHxRSohvsIa6PhVmlG91DWfHbB0kNe/bEI3oJl0sm X61poLmpaF48ovfGEZNWzLmzsbyuNAWN7vTaLR9Rp6DWUiazOIIv/pBeZvJjR0FE699EaC R7OSKhyNdxW0xipBhVilWNcWDJ/2YVPDQ1RTqAsn1igdWgNp6Bv5P6HIsMrSkK8YR8Cb/V 9XEM4nQKVfPjSxJpy8pv9MiIDzsultts5gcrS8odz/nsH2i3p+XqD/dymi7/Plioh7lqsQ 1jVh/LVUymETp9LzBTu0gT6VE9bl9T8OudYLnlfdWM1SFTDH2t+cAfMnLkU60Q== 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 4Sws8h1bM3zZmR; Thu, 21 Dec 2023 13:43:48 +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 3BLDhm3S079621; Thu, 21 Dec 2023 13:43:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BLDhmB1079618; Thu, 21 Dec 2023 13:43:48 GMT (envelope-from git) Date: Thu, 21 Dec 2023 13:43:48 GMT Message-Id: <202312211343.3BLDhmB1079618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 6983b8c39ff3 - stable/13 - login_cap.c: Don't set errno to ERANGE on memory allocation failure 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6983b8c39ff36b3a4c1090b5cca97d450dca7b34 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6983b8c39ff36b3a4c1090b5cca97d450dca7b34 commit 6983b8c39ff36b3a4c1090b5cca97d450dca7b34 Author: Olivier Certner AuthorDate: 2023-05-25 11:48:40 +0000 Commit: Olivier Certner CommitDate: 2023-12-21 13:38:54 +0000 login_cap.c: Don't set errno to ERANGE on memory allocation failure Modified functions: login_getcaptime(), login_getcapnum(), login_getcapsize(). They all call cgetstr(), which returns -2 on such conditions and already sets errno to ENOMEM, arguably the appropriate value for these functions as well. No in-tree consumer currently checks for errno on error reported by these functions, so this change has no other code impact. Reviewed by: kib Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40342 (cherry picked from commit b8c1aadef9d80786daf731300c33d3a001261422) Approved by: markj (mentor) --- lib/libutil/login_cap.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c index dd7bcefabea6..2b19218a8aaa 100644 --- a/lib/libutil/login_cap.c +++ b/lib/libutil/login_cap.c @@ -653,10 +653,8 @@ login_getcaptime(login_cap_t *lc, const char *cap, rlim_t def, rlim_t error) if ((r = cgetstr(lc->lc_cap, cap, &res)) == -1) return def; - else if (r < 0) { - errno = ERANGE; + else if (r < 0) return error; - } /* "inf" and "infinity" are special cases */ if (isinfinite(res)) @@ -738,19 +736,18 @@ login_getcapnum(login_cap_t *lc, const char *cap, rlim_t def, rlim_t error) /* * For BSDI compatibility, try for the tag= first */ - if ((r = cgetstr(lc->lc_cap, cap, &res)) == -1) { + r = cgetstr(lc->lc_cap, cap, &res); + if (r == -1) { long lval; /* string capability not present, so try for tag# as numeric */ if ((r = cgetnum(lc->lc_cap, cap, &lval)) == -1) return def; /* Not there, so return default */ - else if (r >= 0) + else if (r < 0) + return error; + else return (rlim_t)lval; - } - - if (r < 0) { - errno = ERANGE; + } else if (r < 0) return error; - } if (isinfinite(res)) return RLIM_INFINITY; @@ -789,10 +786,8 @@ login_getcapsize(login_cap_t *lc, const char *cap, rlim_t def, rlim_t error) if ((r = cgetstr(lc->lc_cap, cap, &res)) == -1) return def; - else if (r < 0) { - errno = ERANGE; + else if (r < 0) return error; - } if (isinfinite(res)) return RLIM_INFINITY;