From owner-svn-src-projects@freebsd.org  Tue Nov 22 08:56:30 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 F24BAC4FC66
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue, 22 Nov 2016 08:56:30 +0000 (UTC) (envelope-from ae@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 C49D41AF2;
 Tue, 22 Nov 2016 08:56:30 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAM8uT2c041592;
 Tue, 22 Nov 2016 08:56:29 GMT (envelope-from ae@FreeBSD.org)
Received: (from ae@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAM8uTqk041591;
 Tue, 22 Nov 2016 08:56:29 GMT (envelope-from ae@FreeBSD.org)
Message-Id: <201611220856.uAM8uTqk041591@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org
 using -f
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Tue, 22 Nov 2016 08:56:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r308959 - projects/ipsec/sys/netipsec
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Nov 2016 08:56:31 -0000

Author: ae
Date: Tue Nov 22 08:56:29 2016
New Revision: 308959
URL: https://svnweb.freebsd.org/changeset/base/308959

Log:
  Add key_checksockaddrs() function.
  
  It will be used to check that sockaddr structures from PF_KEY message are
  properly filled.

Modified:
  projects/ipsec/sys/netipsec/key.c

Modified: projects/ipsec/sys/netipsec/key.c
==============================================================================
--- projects/ipsec/sys/netipsec/key.c	Tue Nov 22 08:30:32 2016	(r308958)
+++ projects/ipsec/sys/netipsec/key.c	Tue Nov 22 08:56:29 2016	(r308959)
@@ -654,6 +654,35 @@ key_getspgen(void)
 	return (V_sp_genid);
 }
 
+static int
+key_checksockaddrs(struct sockaddr *src, struct sockaddr *dst)
+{
+
+	/* family match */
+	if (src->sa_family != dst->sa_family)
+		return (EINVAL);
+	/* sa_len match */
+	if (src->sa_len != dst->sa_len)
+		return (EINVAL);
+	switch (src->sa_family) {
+#ifdef INET
+	case AF_INET:
+		if (src->sa_len != sizeof(struct sockaddr_in))
+			return (EINVAL);
+		break;
+#endif
+#ifdef INET6
+	case AF_INET6:
+		if (src->sa_len != sizeof(struct sockaddr_in6))
+			return (EINVAL);
+		break;
+#endif
+	default:
+		return (EAFNOSUPPORT);
+	}
+	return (0);
+}
+
 /*
  * allocating a SP for OUTBOUND or INBOUND packet.
  * Must call key_freesp() later.