Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys remove duplicated validation. That is already done in l2...



details:   https://anonhg.NetBSD.org/src/rev/5256ea31e5f3
branches:  trunk
changeset: 822669:5256ea31e5f3
user:      knakahara <knakahara%NetBSD.org@localhost>
date:      Thu Mar 30 23:13:54 2017 +0000

description:
remove duplicated validation. That is already done in l2tp_lookup_session_ref().

pointed out by s-yamaguchi@IIJ, thanks.

diffstat:

 sys/netinet/in_l2tp.c   |   9 ++-------
 sys/netinet6/in6_l2tp.c |  10 ++--------
 2 files changed, 4 insertions(+), 15 deletions(-)

diffs (61 lines):

diff -r 5315c9145d7a -r 5256ea31e5f3 sys/netinet/in_l2tp.c
--- a/sys/netinet/in_l2tp.c     Thu Mar 30 22:33:18 2017 +0000
+++ b/sys/netinet/in_l2tp.c     Thu Mar 30 23:13:54 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in_l2tp.c,v 1.1 2017/02/16 08:23:35 knakahara Exp $    */
+/*     $NetBSD: in_l2tp.c,v 1.2 2017/03/30 23:13:54 knakahara Exp $    */
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in_l2tp.c,v 1.1 2017/02/16 08:23:35 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_l2tp.c,v 1.2 2017/03/30 23:13:54 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_l2tp.h"
@@ -315,11 +315,6 @@
                goto out;
        }
 
-       if (sess_id != var->lv_my_sess_id) {
-               m_freem(m);
-               goto out;
-       }
-
        m_adj(m, off + sizeof(uint32_t));
 
        if (var->lv_use_cookie == L2TP_COOKIE_ON) {
diff -r 5315c9145d7a -r 5256ea31e5f3 sys/netinet6/in6_l2tp.c
--- a/sys/netinet6/in6_l2tp.c   Thu Mar 30 22:33:18 2017 +0000
+++ b/sys/netinet6/in6_l2tp.c   Thu Mar 30 23:13:54 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6_l2tp.c,v 1.1 2017/02/16 08:23:36 knakahara Exp $   */
+/*     $NetBSD: in6_l2tp.c,v 1.2 2017/03/30 23:13:54 knakahara Exp $   */
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_l2tp.c,v 1.1 2017/02/16 08:23:36 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_l2tp.c,v 1.2 2017/03/30 23:13:54 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_l2tp.h"
@@ -309,12 +309,6 @@
                m_freem(m);
                goto out;
        }
-
-       if (sess_id != var->lv_my_sess_id) {
-               m_freem(m);
-               goto out;
-       }
-
        m_adj(m, off + sizeof(uint32_t));
 
        if (var->lv_use_cookie == L2TP_COOKIE_ON) {



Home | Main Index | Thread Index | Old Index