From owner-svn-src-all@freebsd.org  Sun Aug 11 20:34:25 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5F54AC1218;
 Sun, 11 Aug 2019 20:34:25 +0000 (UTC) (envelope-from gnn@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4669gj1rxWz4Kt7;
 Sun, 11 Aug 2019 20:34:25 +0000 (UTC) (envelope-from gnn@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 22BBD1BB62;
 Sun, 11 Aug 2019 20:34:25 +0000 (UTC) (envelope-from gnn@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7BKYOFM060037;
 Sun, 11 Aug 2019 20:34:24 GMT (envelope-from gnn@FreeBSD.org)
Received: (from gnn@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7BKYOVr060036;
 Sun, 11 Aug 2019 20:34:24 GMT (envelope-from gnn@FreeBSD.org)
Message-Id: <201908112034.x7BKYOVr060036@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gnn set sender to gnn@FreeBSD.org
 using -f
From: "George V. Neville-Neil" <gnn@FreeBSD.org>
Date: Sun, 11 Aug 2019 20:34:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r350865 - stable/11/sys/net
X-SVN-Group: stable-11
X-SVN-Commit-Author: gnn
X-SVN-Commit-Paths: stable/11/sys/net
X-SVN-Commit-Revision: 350865
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Aug 2019 20:34:25 -0000

Author: gnn
Date: Sun Aug 11 20:34:24 2019
New Revision: 350865
URL: https://svnweb.freebsd.org/changeset/base/350865

Log:
  MFC: 350557
  
  Properly validate arguments for route deletion
  
  Reported by: Liang Zhuo brightiup.zhuo@gmail.com

Modified:
  stable/11/sys/net/route.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/net/route.c
==============================================================================
--- stable/11/sys/net/route.c	Sun Aug 11 20:34:16 2019	(r350864)
+++ stable/11/sys/net/route.c	Sun Aug 11 20:34:24 2019	(r350865)
@@ -1612,6 +1612,8 @@ rtrequest1_fib(int req, struct rt_addrinfo *info, stru
 	switch (req) {
 	case RTM_DELETE:
 		if (netmask) {
+			if (dst->sa_len > sizeof(mdst))
+				return (EINVAL);
 			rt_maskedcopy(dst, (struct sockaddr *)&mdst, netmask);
 			dst = (struct sockaddr *)&mdst;
 		}