From nobody Tue Aug 9 20:01:22 2022 X-Original-To: dev-commits-src-branches@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 4M2P8g1t9sz3j8fC; Tue, 9 Aug 2022 20:01:23 +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 4M2P8g15cyz3m2c; Tue, 9 Aug 2022 20:01:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660075283; 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=qlXnqE2ll4GrS3W7fNM1J681jqcCgilGbimUmDxKmJQ=; b=rlOf4HsarlJ6iKSuKTrFY1Scr/APMICxLvXceIxI/1gPC0MosdyOpYogZhSoCwQz51EX+4 uGZpTzvEtOwsv+IGKTdO92h7GdUTBAJhcj7ElsYX8Kg7zhFO6a3Ohg8/G7AU+rx7Lby3LS f6URkXJowPwNUYohquvvNL+b2KWGbQHFQ2pUSmv1eHXffQ3ZYxAh4myQwU9fQHzC5Zffzt xoJ3Ev6Q9aQQWoxFabTBVnDeKNduVXRitKQYHNmzJmfe3IxsNr8wPZW8ZgnvrrcZY5w3gb 6gLN+jes1RNz2V8lJc+os/ZMljstdWkvqZbVfb61fFzFhmltwy6knagY/dDtjA== 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 4M2P8f71KKzklr; Tue, 9 Aug 2022 20:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 279K1Mah031358; Tue, 9 Aug 2022 20:01:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 279K1MSa031357; Tue, 9 Aug 2022 20:01:22 GMT (envelope-from git) Date: Tue, 9 Aug 2022 20:01:22 GMT Message-Id: <202208092001.279K1MSa031357@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 26db194f3db1 - releng/13.1 - pam_exec: fix segfault when authtok is null List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 26db194f3db1238b9339bde23a82def8cfee10b1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660075283; 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=qlXnqE2ll4GrS3W7fNM1J681jqcCgilGbimUmDxKmJQ=; b=t0SrW8i2S1GLWYnfU4sxU+RdQ6mEWabe8x5g2IV76EiUY0oUIn3slPIRBLQeSJEeu59NG+ Tj9skitC1Dj/exkdYQE+kc/TVP00n470ajijYD7/6tjl44l18v3v9KhtjRuvM7xFO23sEL PJ51qyngdlCdOpqyHV8vPuIs5/O3AvZaKT389+uLHzT96bIBrzdUNof5mNar6klcz4r0fK 9oqAOgDzCdBapzvbpZoQ9ApLur7pmRCt0GsEKsJ+NP1SO8c0FklwcydDi77KX91CGRhHhV 8Zc/wN6eVg7Va8tIPoffPOMGKeJviTHEYq0Os882x9uzMcEtmsbmqVPWNJtX1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660075283; a=rsa-sha256; cv=none; b=woEIuvHiALEqEuSZPE8DE4yJO2WVU9xkHYPv/ra8FJDw2Nu/1QnNwWBx3TemfLpqRv2QST tLLRnUxzBRuJrf+Pbj7EYWu9h6wIRBp5nmUnfswtSPlcTWK7KtoSaIV7eeVB4iIc63d+Vb 5Ove7Nz6ILCn9gCIbpp3vcmDzEJIjSm7xsio2EbKPHWlk+MGT+CuCypVt0eo+H74/u8O4o HVt0rjH+e6qrJIxj1dOIWpNY8MMOlmaVWgOwFKMJg8yeon7pRSiYzOCTQ6ANK/Xjf3Rfxj c8LmlMDH1FxGrsMqFqjz9nZjwUwlcQxXj6bRlDx2MSqPkANnft3ubQDYTDDTWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=26db194f3db1238b9339bde23a82def8cfee10b1 commit 26db194f3db1238b9339bde23a82def8cfee10b1 Author: Yan Ka Chiu AuthorDate: 2022-05-22 16:33:02 +0000 Commit: Mark Johnston CommitDate: 2022-07-25 21:01:46 +0000 pam_exec: fix segfault when authtok is null According to pam_exec(8), the `expose_authtok` option should be ignored when the service function is `pam_sm_setcred`. Currently `pam_exec` only prevent prompt for anth token when `expose_authtok` is set on `pam_sm_setcred`. This subsequently led to segfault when there isn't an existing auth token available. Bug reported on this: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=263893 After reading https://reviews.freebsd.org/rS349556 I am not sure if the default behaviour supposed to be simply not prompt for authentication token, or is it to ignore the option entirely as stated in the man page. This patch is therefore only adding an additional NULL check on the item `pam_get_item` provide, and exit with `PAM_SYSTEM_ERR` when such item is NULL. Approved by: so Security: FreeBSD-EN-22:19.pam_exec MFC after: 1 week Reviewed by: des, khng Differential Revision: https://reviews.freebsd.org/D35169 (cherry picked from commit b75e0eed345d2ab047a6b1b00a9a7c3bf92e992c) (cherry picked from commit ea80848e1c0639e2ac8d3f974ddb9c6233491eb3) --- lib/libpam/modules/pam_exec/pam_exec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/libpam/modules/pam_exec/pam_exec.c b/lib/libpam/modules/pam_exec/pam_exec.c index b8f2e1d8fdfc..ef2680d80525 100644 --- a/lib/libpam/modules/pam_exec/pam_exec.c +++ b/lib/libpam/modules/pam_exec/pam_exec.c @@ -261,6 +261,13 @@ _pam_exec(pam_handle_t *pamh, /* don't prompt, only expose existing token */ rc = pam_get_item(pamh, PAM_AUTHTOK, &item); authtok = item; + if (authtok == NULL && rc == PAM_SUCCESS) { + openpam_log(PAM_LOG_ERROR, + "%s: pam_get_authtok(): %s", + func, "authentication token not available"); + OUT(PAM_SYSTEM_ERR); + } + } else { rc = pam_get_authtok(pamh, PAM_AUTHTOK, &authtok, NULL); }