From owner-svn-src-head@FreeBSD.ORG  Thu Oct  6 21:55:05 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A67B8106564A;
	Thu,  6 Oct 2011 21:55:05 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8CDB18FC0C;
	Thu,  6 Oct 2011 21:55:05 +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 p96Lt5tZ079406;
	Thu, 6 Oct 2011 21:55:05 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p96Lt5bd079404;
	Thu, 6 Oct 2011 21:55:05 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201110062155.p96Lt5bd079404@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 6 Oct 2011 21:55:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226079 - head/sys/compat/linux
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Oct 2011 21:55:05 -0000

Author: jkim
Date: Thu Oct  6 21:55:05 2011
New Revision: 226079
URL: http://svn.freebsd.org/changeset/base/226079

Log:
  Use the caculated length instead of maximum length.

Modified:
  head/sys/compat/linux/linux_socket.c

Modified: head/sys/compat/linux/linux_socket.c
==============================================================================
--- head/sys/compat/linux/linux_socket.c	Thu Oct  6 21:40:08 2011	(r226078)
+++ head/sys/compat/linux/linux_socket.c	Thu Oct  6 21:55:05 2011	(r226079)
@@ -166,11 +166,11 @@ linux_getsockaddr(struct sockaddr **sap,
 			namelen = strnlen(name + 1, salen - hdrlen - 1) + 1;
 		} else
 			namelen = strnlen(name, salen - hdrlen);
-		if (hdrlen + namelen > sizeof(struct sockaddr_un)) {
+		salen = hdrlen + namelen;
+		if (salen > sizeof(struct sockaddr_un)) {
 			error = ENAMETOOLONG;
 			goto out;
 		}
-		salen = sizeof(struct sockaddr_un);
 	}
 
 	sa = (struct sockaddr *)kosa;