From owner-svn-src-head@freebsd.org  Tue Nov 22 18:31:45 2016
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 39E71C4F3A4;
 Tue, 22 Nov 2016 18:31:45 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (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 0A1A4CE8;
 Tue, 22 Nov 2016 18:31:44 +0000 (UTC) (envelope-from br@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAMIViEF077909;
 Tue, 22 Nov 2016 18:31:44 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAMIViaL077908;
 Tue, 22 Nov 2016 18:31:44 GMT (envelope-from br@FreeBSD.org)
Message-Id: <201611221831.uAMIViaL077908@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org
 using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Tue, 22 Nov 2016 18:31:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r309018 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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: Tue, 22 Nov 2016 18:31:45 -0000

Author: br
Date: Tue Nov 22 18:31:43 2016
New Revision: 309018
URL: https://svnweb.freebsd.org/changeset/base/309018

Log:
  Revert r306186 ("Adjust the sopt_val pointer on bigendian systems").
  
  This logic doesn't work with bigger sopt_valsize (e.g. when ipfw
  passing 2048 bytes rule).
  
  Reported by:	adrian
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/kern/uipc_socket.c

Modified: head/sys/kern/uipc_socket.c
==============================================================================
--- head/sys/kern/uipc_socket.c	Tue Nov 22 18:13:46 2016	(r309017)
+++ head/sys/kern/uipc_socket.c	Tue Nov 22 18:31:43 2016	(r309018)
@@ -2455,12 +2455,8 @@ sooptcopyin(struct sockopt *sopt, void *
 	 */
 	if ((valsize = sopt->sopt_valsize) < minlen)
 		return EINVAL;
-	if (valsize > len) {
-#if _BYTE_ORDER == _BIG_ENDIAN
-		sopt->sopt_val = (void *)((uintptr_t)sopt->sopt_val + (valsize - len));
-#endif
+	if (valsize > len)
 		sopt->sopt_valsize = valsize = len;
-	}
 
 	if (sopt->sopt_td != NULL)
 		return (copyin(sopt->sopt_val, buf, valsize));