From nobody Mon Oct 2 20:46:27 2023 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 4RztKH3vc4z4wTCd; Mon, 2 Oct 2023 20:46:27 +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 4RztKH3S3hz3LGd; Mon, 2 Oct 2023 20:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696279587; 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=GzZ4PxZe6kv06zJ60w3qHJi9T/pg7dHv/oo5GBM7DqA=; b=d6YNT0b+I1Nqqaq0SuCbOP/MDU00x+RqtzMPHD2WlsbXHJEz3x8yH5TBAzqiALQGqrVF+j AzRH7GCFQ4DfB7zxhn1QAbYluFTSJZKPj1cy23SBHy+Y6boBhO8rKFpANUzzzAP+QmB13k deu82ls3bODE0agFcpnSVm/tMRl3fhNSvwhLUHV9OJKujPDitZdNnMqsj/+LdBjbgFCGbb 5UhLkCug6DZMnOji30fjxyVefsX4/g3Z6ly39eZOyd53MbeQcAKSSk03kDRxMUI3Kiq9oW dZobseOp1BtnFB/DFtDCewJxOluZjt7MNeWqdWHn7g7CVQ+wsb0vJVqPw905BA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696279587; a=rsa-sha256; cv=none; b=a/apnjSLcxQpn7a93EzIrPGG20Eso6exxxCShBSx4Fc9gpWxbb+UkC3ZfhPoOBP7rP0lpE xCX+4ARgrjS/y4rRhhwdFS7kAfkiZPrtXogYIJ/0GUVJuRDrsyzB90WyVjuQ2EiQKZ2yd+ 28QTu+XODm6162+71bgQ0RmU10K/SMXh1t3HOnysHzWAKAz0GajL69XHx3IEby83JntKr8 jPfP+iguUi16mU9W/C4W8JyyVxrENgV0Mm6ad9SMh1M68MB7txbiYwp0ikh9DAwWjbccp4 0BnctMql6TEEoIZkg1ihvr11/Kh+Dq30+7YCPeklaVh2gDoGHbNe4a3ZyKgEEQ== 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=1696279587; 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=GzZ4PxZe6kv06zJ60w3qHJi9T/pg7dHv/oo5GBM7DqA=; b=t1r+KJwQYIT7Sp+Xvq8lXNpGH1pCy1n3oZunHvadc6sETjN2XeA4Qkox2c4iJukQjr7uLV YUaVoeOJ4Yo+ItV/puIcocKzgzgJDt1++1IJCC/+QbEdB8BqLECL5mjbeFoEJuE+wlkBoY XUXY9TWQuXEeZ9gdppjW4IzZEQ8dYgTr1jEzHMee1l/xdkqENTkkNZvx+q4lDeBjTfC2IS pFQHEqKISb2kcZlXJqHQCBqDKujcvKwPUzHSm6gfjwb3iXfRF0CfZ2WUtOkXftsNt1JiZu QmVH+SajyehGyeoUpmQkShIwxmTXcU/VkZKr7U41PUJMR1lWDv91FhmzrtX+Qw== 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 4RztKH2WQnzBGK; Mon, 2 Oct 2023 20:46:27 +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 392KkRlw019805; Mon, 2 Oct 2023 20:46:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 392KkRXW019802; Mon, 2 Oct 2023 20:46:27 GMT (envelope-from git) Date: Mon, 2 Oct 2023 20:46:27 GMT Message-Id: <202310022046.392KkRXW019802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b8c1aadef9d8 - main - login_cap.c: Don't set errno to ERANGE on memory allocation failure 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8c1aadef9d80786daf731300c33d3a001261422 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b8c1aadef9d80786daf731300c33d3a001261422 commit b8c1aadef9d80786daf731300c33d3a001261422 Author: Olivier Certner AuthorDate: 2023-05-25 11:48:40 +0000 Commit: Ed Maste CommitDate: 2023-10-02 20:41:22 +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 --- 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;