From owner-svn-src-stable@FreeBSD.ORG  Tue Dec 13 13:03:11 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6FBEA1065675;
	Tue, 13 Dec 2011 13:03:11 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5DF038FC0C;
	Tue, 13 Dec 2011 13:03:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBDD3BtR050940;
	Tue, 13 Dec 2011 13:03:11 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBDD3Bdp050938;
	Tue, 13 Dec 2011 13:03:11 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201112131303.pBDD3Bdp050938@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Tue, 13 Dec 2011 13:03:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228467 - stable/7/contrib/openpam/lib
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Dec 2011 13:03:11 -0000

Author: des
Date: Tue Dec 13 13:03:11 2011
New Revision: 228467
URL: http://svn.freebsd.org/changeset/base/228467

Log:
  MFH r228384: validate the service name
  
  Security:	some poorly thought out programs allow the user to specify
  		the service name; this patch makes it harder to trick these
  		programs into loading and executing arbitrary code.

Modified:
  stable/7/contrib/openpam/lib/openpam_configure.c
Directory Properties:
  stable/7/contrib/openpam/   (props changed)

Modified: stable/7/contrib/openpam/lib/openpam_configure.c
==============================================================================
--- stable/7/contrib/openpam/lib/openpam_configure.c	Tue Dec 13 13:02:52 2011	(r228466)
+++ stable/7/contrib/openpam/lib/openpam_configure.c	Tue Dec 13 13:03:11 2011	(r228467)
@@ -285,6 +285,13 @@ openpam_load_chain(pam_handle_t *pamh,
 	size_t len;
 	int r;
 
+	/* don't allow to escape from policy_path */
+	if (strchr(service, '/')) {
+		openpam_log(PAM_LOG_ERROR, "invalid service name: %s",
+		    service);
+		return (-PAM_SYSTEM_ERR);
+	}
+
 	for (path = openpam_policy_path; *path != NULL; ++path) {
 		len = strlen(*path);
 		if ((*path)[len - 1] == '/') {