From owner-svn-src-head@freebsd.org  Sat Jul 14 23:53:52 2018
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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 46F6C10435FE;
 Sat, 14 Jul 2018 23:53:52 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id E06C08E21E;
 Sat, 14 Jul 2018 23:53:51 +0000 (UTC)
 (envelope-from sbruno@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BC05D25F1F;
 Sat, 14 Jul 2018 23:53:51 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6ENrp0H050131;
 Sat, 14 Jul 2018 23:53:51 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6ENrpIK050130;
 Sat, 14 Jul 2018 23:53:51 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201807142353.w6ENrpIK050130@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Sat, 14 Jul 2018 23:53:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r336298 - head/sys/netinet
X-SVN-Group: head
X-SVN-Commit-Author: sbruno
X-SVN-Commit-Paths: head/sys/netinet
X-SVN-Commit-Revision: 336298
X-SVN-Commit-Repository: base
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.27
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: Sat, 14 Jul 2018 23:53:52 -0000

Author: sbruno
Date: Sat Jul 14 23:53:51 2018
New Revision: 336298
URL: https://svnweb.freebsd.org/changeset/base/336298

Log:
  There was quite a bit of feedback on r336282 that has led to the
  submitter to want to revert it.

Modified:
  head/sys/netinet/ip_output.c

Modified: head/sys/netinet/ip_output.c
==============================================================================
--- head/sys/netinet/ip_output.c	Sat Jul 14 21:32:32 2018	(r336297)
+++ head/sys/netinet/ip_output.c	Sat Jul 14 23:53:51 2018	(r336298)
@@ -1256,18 +1256,12 @@ ip_ctloutput(struct socket *so, struct sockopt *sopt)
 		switch (sopt->sopt_name) {
 		case IP_OPTIONS:
 		case IP_RETOPTS:
-			if (inp->inp_options) {
-				unsigned long len = ulmin(inp->inp_options->m_len, sopt->sopt_valsize);
-				struct mbuf *options = malloc(len, M_TEMP, M_WAITOK);
-				INP_RLOCK(inp);
-				bcopy(inp->inp_options, options, len);
-				INP_RUNLOCK(inp);
+			if (inp->inp_options)
 				error = sooptcopyout(sopt,
-						     mtod(options,
+						     mtod(inp->inp_options,
 							  char *),
-						     len);
-				free(options, M_TEMP);
-			} else
+						     inp->inp_options->m_len);
+			else
 				sopt->sopt_valsize = 0;
 			break;