From owner-svn-src-all@freebsd.org Mon May 23 05:11:09 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D4761B46863; Mon, 23 May 2016 05:11:09 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A5D241204; Mon, 23 May 2016 05:11:09 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4N5B8YW082117; Mon, 23 May 2016 05:11:08 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4N5B8DE082116; Mon, 23 May 2016 05:11:08 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201605230511.u4N5B8DE082116@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Mon, 23 May 2016 05:11:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r300453 - stable/10/lib/libpam/modules/pam_unix X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 May 2016 05:11:09 -0000 Author: truckman Date: Mon May 23 05:11:08 2016 New Revision: 300453 URL: https://svnweb.freebsd.org/changeset/base/300453 Log: MFC r299926 Hoist the getpwnam() call outside the first if/else block in pam_sm_chauthtok(). Set user = getlogin() inside the true branch so that it is initialized for the following PAM_LOG() call. This is how it is done in pam_sm_authenticate(). Reported by: Coverity CID: 272498 Modified: stable/10/lib/libpam/modules/pam_unix/pam_unix.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libpam/modules/pam_unix/pam_unix.c ============================================================================== --- stable/10/lib/libpam/modules/pam_unix/pam_unix.c Mon May 23 05:07:13 2016 (r300452) +++ stable/10/lib/libpam/modules/pam_unix/pam_unix.c Mon May 23 05:11:08 2016 (r300453) @@ -278,13 +278,13 @@ pam_sm_chauthtok(pam_handle_t *pamh, int int pfd, tfd, retval; if (openpam_get_option(pamh, PAM_OPT_AUTH_AS_SELF)) - pwd = getpwnam(getlogin()); + user = getlogin(); else { retval = pam_get_user(pamh, &user, NULL); if (retval != PAM_SUCCESS) return (retval); - pwd = getpwnam(user); } + pwd = getpwnam(user); if (pwd == NULL) return (PAM_AUTHTOK_RECOVERY_ERR);