From owner-p4-projects@FreeBSD.ORG  Sat Sep 23 10:23:13 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 6B80416A415; Sat, 23 Sep 2006 10:23:13 +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 42EEE16A40F
	for <perforce@FreeBSD.org>; Sat, 23 Sep 2006 10:23:13 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C08FD43D82
	for <perforce@FreeBSD.org>; Sat, 23 Sep 2006 10:23:08 +0000 (GMT)
	(envelope-from rdivacky@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 k8NAN8K4046899
	for <perforce@FreeBSD.org>; Sat, 23 Sep 2006 10:23:08 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8NAN876046896
	for perforce@freebsd.org; Sat, 23 Sep 2006 10:23:08 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Sat, 23 Sep 2006 10:23:08 GMT
Message-Id: <200609231023.k8NAN876046896@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 106543 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: Sat, 23 Sep 2006 10:23:13 -0000

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

Change 106543 by rdivacky@rdivacky_witten on 2006/09/23 10:22:21

	Return EINVAL instead of EFAULT when namelen is not correct.

Affected files ...

.. //depot/projects/linuxolator/src/sys/compat/linux/linux_socket.c#6 edit

Differences ...

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

@@ -723,8 +723,11 @@
 	bsd_args.anamelen = PTRIN(linux_args.namelen);/* XXX */
 	error = accept(td, &bsd_args);
 	bsd_to_linux_sockaddr((struct sockaddr *)bsd_args.name);
-	if (error)
+	if (error) {
+	   	if (error == EFAULT && linux_args.namelen != sizeof(struct sockaddr_in))
+		   	return (EINVAL);
 		return (error);
+	}
 	if (linux_args.addr) {
 		error = linux_sa_put(PTRIN(linux_args.addr));
 		if (error) {