diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2014-06-13 06:44:12 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2014-06-13 06:44:12 +0000 |
| commit | bed65f11bfe7696fd5d02c19174c617e45871949 (patch) | |
| tree | 3e9bd64d2788672d12bca5adebddbf83d38e127a | |
| parent | f9935ea71e63d70ca63b13d96ce7256b7f726d74 (diff) | |
Fix KASSERT on pipex_ppp_input(). Must not reached there even if the
tunneling protocol is PPPoE.
| -rw-r--r-- | sys/net/pipex.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/net/pipex.c b/sys/net/pipex.c index 105966f8c7b..cba7ad53ea5 100644 --- a/sys/net/pipex.c +++ b/sys/net/pipex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pipex.c,v 1.51 2014/06/13 06:35:58 yasuoka Exp $ */ +/* $OpenBSD: pipex.c,v 1.52 2014/06/13 06:44:11 yasuoka Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -1103,10 +1103,9 @@ pipex_ppp_input(struct mbuf *m0, struct pipex_session *session, int decrypted) default: if (decrypted) goto drop; - KASSERT(session->protocol == PIPEX_PROTO_PPPOE); - /* will be proccessed by userland */ - m_freem(m0); - return; + /* protocol must be checked on pipex_common_input() already */ + KASSERT(0); + goto drop; } return; |