From nobody Fri Jan 12 15:44:26 2024 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 4TBQnk5VGFz573DZ; Fri, 12 Jan 2024 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 4TBQnk53brz4M2k; Fri, 12 Jan 2024 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=1705074266; 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=JtXy593YLQ5zQ3RQiC5vm/OYjlBiDcoEMEfB7I1Da8c=; b=CcyMfHXsNFyQlHZdOrsOCB43qOzkm9CGyT4RTBqQU/0nuHExV+vJl1d1c7x3aa64QbXQHu l6Q6L3wbcteXt9E9ngiZXjY6D6gNByogwvuAK8CkW82qStMdD1vyycOjnlMen39SPlP/pO mWkwoa7YR1zESv18+QJzfgMSXCQHCfz1sdA3I1JbmVOzkdPw75mBet4MFUX1hfKRBS3k8G hkTawkF45zBz1A2rJQdEzQxND0jt1EdEx85EqlHey9LX48DlRP50boAPiHjewJer+YuasI upLUFTc0mEEa3b/+7npDgG6VmgIKYJo9b3ehJfUGwxswK9rTlJBWSRsxIFGOfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705074266; 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=JtXy593YLQ5zQ3RQiC5vm/OYjlBiDcoEMEfB7I1Da8c=; b=cwnb6XtWXprjxjbWCcI6qiL62JfrwH9zUNs3qU0gmvG8snaVvZoYVK5LVj2Nnmt7wqp8+e K6qB+uSrTEs7hb4Q4jvnKt1iZFDpAhGIb2ggP838fv55BXtp8n6RXOuFvQmKMHnOdhXZlY w9ubEG+m7epoTYk8KQHg6ksLzcRW9Ok7kxkyRCKQX/69PRBDJICMUvlaVZVCQIexN5L77I Lj1f/RVEwJDEJ5IwNOfbpf2VaX3Nm8pFX4tR0WdbShGSDS8TMTt0sy3t7evqi/rDPTzQ56 JLEmkYnYjb0kBj8qvPM+s96sYjpzfOkgbvzoRzSUG3B1p9SIk2jKDSRCvtpw+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705074266; a=rsa-sha256; cv=none; b=uMxLgWzLT6uqoRusAqIzaFHVfG1TpShvgmgH6g8jIj+oxDJT1RE4mGMwKwKKG6pgHg60nP XjcppgvrGYyFrgqLWPwIYXc3CU3wMKnqNE3fShBPU2tT96P/HV8erLG4VK8Hmjw6Nb06F8 JP9CSO+fY5zOdPHMQxxr8dfU3fUr/ybjdfcSRtRUeybbcZvWzeJCHmVPfq5cRGScxeh3WK FWRtNFMIc627a9QE9ZJG+iUTa01H9tbt8g12j3451deh8W7cFSLpNhRQj0Tv68Lg94VD/x T09FKfi8Vu60xbw6q7NJOv6SbuJ6qG6wgXxvI6xqiBoUgUOltyzaRCXTli8j7w== 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 4TBQnk46XXz17MW; Fri, 12 Jan 2024 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 40CFiQ8l076533; Fri, 12 Jan 2024 15:44:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CFiQvH076530; Fri, 12 Jan 2024 15:44:26 GMT (envelope-from git) Date: Fri, 12 Jan 2024 15:44:26 GMT Message-Id: <202401121544.40CFiQvH076530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a3d80dd8aa6a - main - login: Use getpwnam_r() instead of getpwnam(). 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3d80dd8aa6ac15877e00102ab174b417ac81d79 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a3d80dd8aa6ac15877e00102ab174b417ac81d79 commit a3d80dd8aa6ac15877e00102ab174b417ac81d79 Author: Dag-Erling Smørgrav AuthorDate: 2024-01-12 15:40:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-01-12 15:43:42 +0000 login: Use getpwnam_r() instead of getpwnam(). Since we expect the entry to still be valid after calling into PAM, which may call getpwnam() itself, we need to use getpwnam_r(). MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans, imp, allanjude, markj Differential Revision: https://reviews.freebsd.org/D43376 --- usr.bin/login/login.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c index 409e6cc373ad..5b4fa55dc541 100644 --- a/usr.bin/login/login.c +++ b/usr.bin/login/login.c @@ -110,6 +110,8 @@ static u_int timeout = 300; /* Buffer for signal handling of timeout */ static jmp_buf timeout_buf; +char pwbuf[1024]; +struct passwd pwres; struct passwd *pwd; static int failures; @@ -315,7 +317,7 @@ main(int argc, char *argv[]) bail(NO_SLEEP_EXIT, 1); } - pwd = getpwnam(username); + (void)getpwnam_r(username, &pwres, pwbuf, sizeof(pwbuf), &pwd); if (pwd != NULL && pwd->pw_uid == 0) rootlogin = 1; @@ -338,7 +340,7 @@ main(int argc, char *argv[]) (void)setpriority(PRIO_PROCESS, 0, 0); } - if (pwd && rval == 0) + if (pwd != NULL && rval == 0) break; pam_cleanup();