From nobody Fri Oct 13 15:44:25 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 4S6W5k5BjKz4x8wF; Fri, 13 Oct 2023 15:44: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 4S6W5k0wnSz3Y22; Fri, 13 Oct 2023 15:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697211866; 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=h5W/x3SsLDk8eigldwlVeiwaLoc4x2UxYfAlXH/ds6c=; b=x3ZEtg3/krWiffyQ7PzB6QMrHhHqxeGNxsLR1Bz2HwyYLFux5XB3aZnZp8KTP0K8gtQr1D cDAk2ifA8487hsQXJhbDoi+gINmmVwIR6EHPKSRm7ee1D3CpuDTqq9gTZOduUQU5BQPbDO mQTZ0wwRQuieJTSg3lCi92fizfyhT+4YMNxg6P2JWFVhy9+Ifa8FmkU5bjZUTGskfHxrYc Al61CvQ1zmPmzbZuD5bPfxv7TCY4l+2dOz/vdQiGk2YX5uUXIApvuxMYdxpHwciw4SKPx4 nXy8e3Gznv5g3MNSArQMgEQGfNohqBoLnBOoEsRNgZiBnMQH/hJomyKischMZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697211866; a=rsa-sha256; cv=none; b=qyoH/uvnA9WZL4cLIwu4ykdC0SMBphbZ3kVAPg60K0YlMrQ9u5tGTxYrR2ITfRKKIO9E9P 4Y4EK05mnr4Wp5qVgfDYDpVsFtTfQdPFKBJEyrwgmkxRPIt1e2BJHBxsyJKl4p4flP4Z7z QvDwTLOrWHIeTL9vnlar/r4QLwNr2kh8jxbd1YhpEDMihFiqSEOkg/DvGPon1NGYQ+1EYE lCW+dPJx3KLvqycuWDq8huGnZ+0lJTaj3oHitNzwoqvFrZn3xoesapBj6BsuZpcaJ1htHm 6hkFxcmYv6LD+5XNhIfOlmieUHROusb+2TpaTpQPRmkVNeyXOVRDS4Aqz9uCqw== 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=1697211866; 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=h5W/x3SsLDk8eigldwlVeiwaLoc4x2UxYfAlXH/ds6c=; b=yz/JYGhNJKWe9PW2cha7eVTV9+XIvHZKlca4iixkeq66x5WgyRfOK3Begq/TDKE3wwZVxG cfOLArQS69OFeFNN+7wM54PP4Lgv2srGgEjPu4fSmGG58jtgX7PwyBhZl64p9T/1BD130z KWeO/VkC+y1Tia8Xea6htOTH18d7nxxLOnR7CpzWM8MXqg1BoD8S1mg/x3mohMeory6Vsg rdciAs/1QxDLj4qfxaxwLM0ct9LnPHkQWQ5aCp5O3nkQ42T4zXSaY3XC68LNtUdxB09pFB 6e7woJyET/0gOr98ehNTEtS4tA1d1YoVGHDaZ3wRG5zNOLCWfFASZ6YWxAeX7w== 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 4S6W5k025wztqr; Fri, 13 Oct 2023 15:44:26 +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 39DFiPDE015170; Fri, 13 Oct 2023 15:44:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39DFiPGL015167; Fri, 13 Oct 2023 15:44:25 GMT (envelope-from git) Date: Fri, 13 Oct 2023 15:44:25 GMT Message-Id: <202310131544.39DFiPGL015167@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 83bcaf3b2d6c - stable/14 - 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 83bcaf3b2d6cb173ee126f504478fa6ace4f406f Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=83bcaf3b2d6cb173ee126f504478fa6ace4f406f commit 83bcaf3b2d6cb173ee126f504478fa6ace4f406f Author: Olivier Certner AuthorDate: 2023-05-25 11:48:40 +0000 Commit: Ed Maste CommitDate: 2023-10-13 14:13:38 +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 MFC after: 2 weeks Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40342 (cherry picked from commit b8c1aadef9d80786daf731300c33d3a001261422) --- 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 e71d38d2d93b..aeda7d5e828b 100644 --- a/lib/libutil/login_cap.c +++ b/lib/libutil/login_cap.c @@ -650,10 +650,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)) @@ -735,19 +733,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; @@ -786,10 +783,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;