From owner-p4-projects@FreeBSD.ORG  Sun Oct 29 17:41:55 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3B82216A47E; Sun, 29 Oct 2006 17:41:55 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EFED616A416
	for <perforce@freebsd.org>; Sun, 29 Oct 2006 17:41:54 +0000 (UTC)
	(envelope-from netchild@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5DB2743D49
	for <perforce@freebsd.org>; Sun, 29 Oct 2006 17:41:54 +0000 (GMT)
	(envelope-from netchild@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9THfqXW073173
	for <perforce@freebsd.org>; Sun, 29 Oct 2006 17:41:52 GMT
	(envelope-from netchild@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9THfpvn073170
	for perforce@freebsd.org; Sun, 29 Oct 2006 17:41:51 GMT
	(envelope-from netchild@freebsd.org)
Date: Sun, 29 Oct 2006 17:41:51 GMT
Message-Id: <200610291741.k9THfpvn073170@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	netchild@freebsd.org using -f
From: Alexander Leidinger <netchild@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 108673 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Oct 2006 17:41:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=108673

Change 108673 by netchild@netchild_magellan on 2006/10/29 17:41:35

	linux_prctl():
	- Currently LINUX_MAX_COMM_LEN is smaller than MAXCOMLEN, but in case
	  this will change we have a buffer overflow. Apply some defensive
	  programming to DTRT when this should happen.
	- Use strlcpy instead of strcpy.
	- Use copyinstr instead of copyin (and while I'm here fix a copy&paste
	  bug in the order of the arguments).
	- Properly lock the read case (PR_GET_NAME) like the write case.
	Discussed with:	rwatson
	X-MFP4 after:	review from rwatson

Affected files ...

.. //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#21 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/compat/linux/linux_misc.c#21 (text+ko) ====

@@ -1560,7 +1560,7 @@
 int
 linux_prctl(struct thread *td, struct linux_prctl_args *args)
 {
-   	int error = 0;
+   	int error = 0, max_size;
 	struct proc *p = td->td_proc;
 	char comm[LINUX_MAX_COMM_LEN];
 	struct linux_emuldata *em;
@@ -1589,16 +1589,22 @@
 		EMUL_UNLOCK(&emul_lock);
 		break;
 	case LINUX_PR_SET_NAME:
-		comm[LINUX_MAX_COMM_LEN-1] = 0;
-		error = copyin(comm, (void *)(register_t) args->arg2, LINUX_MAX_COMM_LEN-1);
+		max_size = (LINUX_MAX_COMM_LEN <= MAXCOMLEN + 1) ?
+				LINUX_MAX_COMM_LEN : (MAXCOMLEN + 1);
+		error = copyinstr((void *)(register_t) args->arg2, comm,
+			    max_size, NULL);
 		if (error)
 		   	return (error);
 		PROC_LOCK(p);
-		strcpy(p->p_comm, comm);
+		strlcpy(p->p_comm, comm, MAXCOMLEN + 1);
 		PROC_UNLOCK(p);
 		break;
 	case LINUX_PR_GET_NAME:
-		error = copyout(&p->p_comm, (void *)(register_t) args->arg2, MAXCOMLEN+1);
+		PROC_LOCK(p);
+		strlcpy(comm, p->p_comm, LINUX_MAX_COMM_LEN);
+		PROC_UNLOCK(p);
+		error = copyout(comm, (void *)(register_t) args->arg2,
+			    strlen(comm)+1);
 		break;
 	default:
 		error = EINVAL;