From nobody Wed Jan 17 18:28:39 2024 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 4TFZBw2vhmz56P4n; Wed, 17 Jan 2024 18:28:40 +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 4TFZBv70DYz4cRq; Wed, 17 Jan 2024 18:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705516120; 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=Ntt31lBbi2SqkBLVoepNqSY0VQg6CfAe/8sZOjww+O4=; b=h7nq1g2paUOdV7derlwZO9FqON9fnr5PJowR2IIlnh0V/9Xgw4s1cxjhZYl1AsmOwZO3Uv op54wBQS0w0d6jPDaWNmnaRNGHykTIqrEOp2UOnH8thAqR2P4RQMb1sOY04p1kOt+RQ2do KMK8paJvoanFzzlV9dAlo8R7LaBpF0NKnJm8U+iitNiSSonUbOhGf8zRFd/a62WTCKHJX7 KEJ6E1TYrcTv57vWh2m7l3owOJCumib8DgZ5laH6FwUq7JkF1pb+gLPo1Nsw0JPGl2XAmU 7wsizRTeomDnE3tyZov8K8exZFz6Dr+NiRDiPDA40MyjpRhO3sjok/XpXjdX3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705516120; 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=Ntt31lBbi2SqkBLVoepNqSY0VQg6CfAe/8sZOjww+O4=; b=uhTS4cECLbWPT9bAH1ELnf08RrM7WHFgiU5q+e5oWVdOOY9WX6H8gQwBO1pikhnZd9l4DN VGXeHx46Db4mGOOKwhQexyOyqhVaq/d7qVtv0J8hIYxw/fy43p8LAR1mSyuGx1XcVpl1x+ Lwutmt6nZTpSCnucAg2V0MG9TmzBjj1WcjoE6sHqOGpZPHj2GTy5cesyatPgQLOqxKPTSg Kqi8sC7VroJYd0AtisgsNR6p6uYQRFRL7KE4ioesLq3g6yeRHX8A4bMRxxt65juLgjag8D KUCEdoSXyD0x4oU4LB/eETLZ/NIgZBGywEzQ9zGpnk8ZVNvATUvakHqlV+Bf+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705516120; a=rsa-sha256; cv=none; b=KRkESQb1QHv1oOrEJMd3ndSyaROTEAOj2PrGARjQi1Sz5714GywGU99gj39OH76tiYMp5v LFv1qjKqCN0Hm+x0/i2lnUXtsGECWBS2xBtyUdnS8bd6YrsTfjJ7OwU1MLrDDrT0zDyoW6 nGyticSdJtaAWAhydQuV0nu+jwHLXk/ht3tZMawC7z85vPB7jC5a7/vya3+USEJTnHmTQO UTewM8a/m1d39Nh/kYdRe6Wi8CU9vvl6D2Mk9hI8Zz73h7xc41jV1hcFipbcPjm7kVu6HR tdZbQfhGmcVcBjFlkXh/XnhBfSUJK9bFkaCVM72lQM4xjJW8tUGQZxBFzRYT4w== 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 4TFZBv47DZzZnF; Wed, 17 Jan 2024 18:28:39 +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 40HISdKk063842; Wed, 17 Jan 2024 18:28:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40HISd38063839; Wed, 17 Jan 2024 18:28:39 GMT (envelope-from git) Date: Wed, 17 Jan 2024 18:28:39 GMT Message-Id: <202401171828.40HISd38063839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9c738c4bca57 - stable/13 - login: Use getpwnam_r() instead of getpwnam(). 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9c738c4bca57354f9f66ebde0c4b625fa6d6c743 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9c738c4bca57354f9f66ebde0c4b625fa6d6c743 commit 9c738c4bca57354f9f66ebde0c4b625fa6d6c743 Author: Dag-Erling Smørgrav AuthorDate: 2024-01-12 15:40:22 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-01-17 16:16:00 +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 (cherry picked from commit a3d80dd8aa6ac15877e00102ab174b417ac81d79) login: Missed an instance of getpwnam(). Fixes: a3d80dd8aa6ac15877e00102ab174b417ac81d79 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D43423 (cherry picked from commit 1e25eb287f3fdd763df98065dbf2e1eb201e4000) --- usr.bin/login/login.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c index c96738151151..d0d4bb4a2394 100644 --- a/usr.bin/login/login.c +++ b/usr.bin/login/login.c @@ -116,6 +116,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; @@ -321,7 +323,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; @@ -344,7 +346,7 @@ main(int argc, char *argv[]) (void)setpriority(PRIO_PROCESS, 0, 0); } - if (pwd && rval == 0) + if (pwd != NULL && rval == 0) break; pam_cleanup(); @@ -708,8 +710,10 @@ auth_pam(void) pam_err = pam_get_item(pamh, PAM_USER, &item); if (pam_err == PAM_SUCCESS) { tmpl_user = (const char *)item; - if (strcmp(username, tmpl_user) != 0) - pwd = getpwnam(tmpl_user); + if (strcmp(username, tmpl_user) != 0) { + (void)getpwnam_r(tmpl_user, &pwres, pwbuf, + sizeof(pwbuf), &pwd); + } } else { pam_syslog("pam_get_item(PAM_USER)"); }