From owner-svn-src-head@freebsd.org  Sun Mar 12 17:15:56 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 9098BD0915B;
 Sun, 12 Mar 2017 17:15:56 +0000 (UTC)
 (envelope-from lstewart@freebsd.org)
Received: from lauren.room52.net (unknown
 [IPv6:2001:19f0:5801:2ba:5400:ff:fe59:15d6])
 (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 511081305;
 Sun, 12 Mar 2017 17:15:56 +0000 (UTC)
 (envelope-from lstewart@freebsd.org)
Received: from lgwl-lstewart2.corp.netflix.com
 (c110-22-60-167.eburwd6.vic.optusnet.com.au [110.22.60.167])
 by lauren.room52.net (Postfix) with ESMTPSA id B375AC71;
 Mon, 13 Mar 2017 04:15:39 +1100 (AEDT)
Subject: Re: svn commit: r314780 - head/lib/libpam/modules/pam_exec
To: "Pedro F. Giffuni" <pfg@freebsd.org>, src-committers@freebsd.org,
 svn-src-all@freebsd.org, svn-src-head@freebsd.org
References: <201703061545.v26FjkNI027057@repo.freebsd.org>
From: Lawrence Stewart <lstewart@freebsd.org>
Message-ID: <739617a4-3eed-28d1-73e4-86d25d6d5fed@freebsd.org>
Date: Mon, 13 Mar 2017 04:14:14 +1100
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101
 Thunderbird/45.4.0
MIME-Version: 1.0
In-Reply-To: <201703061545.v26FjkNI027057@repo.freebsd.org>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Mar 2017 17:15:56 -0000

Hi Pedro,

On 07/03/2017 02:45, Pedro F. Giffuni wrote:
> Author: pfg
> Date: Mon Mar  6 15:45:46 2017
> New Revision: 314780
> URL: https://svnweb.freebsd.org/changeset/base/314780
> 
> Log:
>   libpam: extra bounds checking through reallocarray(3).
>   
>   Reviewed by:	des
>   MFC after:	1 week
> 
> Modified:
>   head/lib/libpam/modules/pam_exec/pam_exec.c
> 
> Modified: head/lib/libpam/modules/pam_exec/pam_exec.c
> ==============================================================================
> --- head/lib/libpam/modules/pam_exec/pam_exec.c	Mon Mar  6 15:42:03 2017	(r314779)
> +++ head/lib/libpam/modules/pam_exec/pam_exec.c	Mon Mar  6 15:45:46 2017	(r314780)
> @@ -138,7 +138,7 @@ _pam_exec(pam_handle_t *pamh __unused,
>  	nitems = sizeof(env_items) / sizeof(*env_items);
>  	/* Count PAM return values put in the environment. */
>  	nitems_rv = options->return_prog_exit_status ? PAM_RV_COUNT : 0;
> -	tmp = realloc(envlist, (envlen + nitems + 1 + nitems_rv + 1) *
> +	tmp = reallocarray(envlist, envlen + nitems + 1 + nitems_rv + 1,
>  	    sizeof(*envlist));
>  	if (tmp == NULL) {
>  		openpam_free_envlist(envlist);
> 

This commit breaks pam_exec for me... without this change I see the
expected PAM_* environment variables from my execed script, but with
this change I no longer see any of them.

Cheers,
Lawrence