From patchwork Tue Jan 16 22:01:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 861914 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zLkj73Vrnz9ryr for ; Wed, 17 Jan 2018 09:02:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751349AbeAPWCR (ORCPT ); Tue, 16 Jan 2018 17:02:17 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:45865 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751182AbeAPWCQ (ORCPT ); Tue, 16 Jan 2018 17:02:16 -0500 Received: by mail-wm0-f68.google.com with SMTP id i186so11270897wmi.4 for ; Tue, 16 Jan 2018 14:02:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Rv7mWo+VWdOKZNyV8Dtkuw1cN3g3wIzuAjBCsf4qdLs=; b=BJ5oO1hBMRTxj8doH/aHfi6TnpGLzNmNM6b7SbhVoVDoLBNWJkbG+221TCsY772ZO9 gqlBWYzRtlAal6W21j7JQSReMHNaHPMduV5fyPsSCx1CPbQOPkT+RuX9BsVEM/kBEW/P gX1WTlnK2KEM8uwycOAIATOL8n4YByOMuQBLE4otGO+5EVy2O1SIffneWfrmqJjPZWOk JnjTT/l46n1F1fCBfEjQ/f3hGCcfNLb091GgRpW5OktnqZoJHclcuszOVDjHL7Ivq2iI LyQRKoKxxQMRfgGi44Uln0bpCTxIe+UcCu/tSW6hxCmrWzjzmwQKhn9yQBQ6zOnXmOK9 PzQg== X-Gm-Message-State: AKwxytc3vewz+fxagoJkXuAHOyIedhLg6dAzt5Xs4iFSfUP00JVS/wRy F/mzLSKnvD/gdE5buDxQoA41MQ== X-Google-Smtp-Source: ACJfBos2ah7Gnuai1h25rg4Dcyji9050xXjDSN7+b83+ReNBF8uqWGjmVqu5ExzIHRho8NHyPMBweQ== X-Received: by 10.28.129.212 with SMTP id c203mr396362wmd.98.1516140135105; Tue, 16 Jan 2018 14:02:15 -0800 (PST) Received: from localhost.localdomain.com ([151.66.74.3]) by smtp.gmail.com with ESMTPSA id n6sm4905474wrn.76.2018.01.16.14.02.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jan 2018 14:02:14 -0800 (PST) From: Lorenzo Bianconi To: davem@davemloft.net Cc: netdev@vger.kernel.org, jchapman@katalix.com, g.nault@alphalink.fr Subject: [PATCH v3 net-next 1/4] l2tp: double-check l2specific_type provided by userspace Date: Tue, 16 Jan 2018 23:01:54 +0100 Message-Id: <30a73bf49939a69c8d501a9e131763db16215608.1516138644.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add sanity check on l2specific_type provided by userspace in l2tp_nl_cmd_session_create() since just L2TP_L2SPECTYPE_DEFAULT and L2TP_L2SPECTYPE_NONE are currently supported. Moreover explicitly set l2specific_type to L2TP_L2SPECTYPE_DEFAULT only if the userspace does not provide a value for it Reviewed-by: Guillaume Nault Tested-by: Guillaume Nault Signed-off-by: Lorenzo Bianconi --- net/l2tp/l2tp_netlink.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c index e1ca29f79821..9ba2b8a68f65 100644 --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c @@ -550,9 +550,16 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf if (info->attrs[L2TP_ATTR_DATA_SEQ]) cfg.data_seq = nla_get_u8(info->attrs[L2TP_ATTR_DATA_SEQ]); - cfg.l2specific_type = L2TP_L2SPECTYPE_DEFAULT; - if (info->attrs[L2TP_ATTR_L2SPEC_TYPE]) + if (info->attrs[L2TP_ATTR_L2SPEC_TYPE]) { cfg.l2specific_type = nla_get_u8(info->attrs[L2TP_ATTR_L2SPEC_TYPE]); + if (cfg.l2specific_type != L2TP_L2SPECTYPE_DEFAULT && + cfg.l2specific_type != L2TP_L2SPECTYPE_NONE) { + ret = -EINVAL; + goto out_tunnel; + } + } else { + cfg.l2specific_type = L2TP_L2SPECTYPE_DEFAULT; + } cfg.l2specific_len = 4; if (info->attrs[L2TP_ATTR_L2SPEC_LEN]) From patchwork Tue Jan 16 22:01:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 861915 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zLkjC3d5Zz9ryr for ; Wed, 17 Jan 2018 09:02:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751436AbeAPWCT (ORCPT ); Tue, 16 Jan 2018 17:02:19 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:39246 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751182AbeAPWCS (ORCPT ); Tue, 16 Jan 2018 17:02:18 -0500 Received: by mail-wr0-f195.google.com with SMTP id z48so16831891wrz.6 for ; Tue, 16 Jan 2018 14:02:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oSs6lrU9Cb2MKLrjMcjkhpvfVEXjjGuwmqryd9yLwrk=; b=g0AmAFcUlRSRXwteGe/VAET8+f0oB35A3UqyL2XaWuCVXjsy0EMBsQ/+fnny9YdiMf S/HaSVCLDsMD0fPK7USct0P9rQ38/xLLE23llmVcCFagDLpn/OC8noDZ0f/0BqrBIXad GPDM38i8r32zWSoG7hD0z44lAXz1YpD6z+oRxSqqC93tvWpnAaQWdu3mWr1n30BYj09T +XCBFLv8eW6KF9B6Zfcnm6J+XRJjVXIJFPpBX7hB943Snexy7onbDsv45woR/txre6Nc 1GHp9sTSsk+C4fzSELqlqdZGHy7Fmgv91oByUGHpEDBhuMAfWQ/H3sZgYLsguJ5OCD4S GgXw== X-Gm-Message-State: AKwxytet7oX4TfpqvFe7dhX4vYisjPFqwzQ5DUGpQlkrkidfuaIhKzpD LvuM4gdx5W6YqkMi9JddnA7SiQ== X-Google-Smtp-Source: ACJfBovg3anNxd2oxo5+KhGkoFVPRkBzj2FkGztbERXOn4wfvUtVryOIlFPs/dFp+kvVkPZDczhb5A== X-Received: by 10.223.133.183 with SMTP id 52mr554855wrt.78.1516140136891; Tue, 16 Jan 2018 14:02:16 -0800 (PST) Received: from localhost.localdomain.com ([151.66.74.3]) by smtp.gmail.com with ESMTPSA id n6sm4905474wrn.76.2018.01.16.14.02.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jan 2018 14:02:16 -0800 (PST) From: Lorenzo Bianconi To: davem@davemloft.net Cc: netdev@vger.kernel.org, jchapman@katalix.com, g.nault@alphalink.fr Subject: [PATCH v3 net-next 2/4] l2tp: remove l2specific_len dependency in l2tp_core Date: Tue, 16 Jan 2018 23:01:55 +0100 Message-Id: X-Mailer: git-send-email 2.13.6 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove l2specific_len dependency while building l2tpv3 header or parsing the received frame since default L2-Specific Sublayer is always four bytes long and we don't need to rely on a user supplied value. Moreover in l2tp netlink code there are no sanity checks to enforce the relation between l2specific_len and l2specific_type, so sending a malformed netlink message is possible to set l2specific_type to L2TP_L2SPECTYPE_DEFAULT (or even L2TP_L2SPECTYPE_NONE) and set l2specific_len to a value greater than 4 leaking memory on the wire and sending corrupted frames. Reviewed-by: Guillaume Nault Tested-by: Guillaume Nault Signed-off-by: Lorenzo Bianconi --- net/l2tp/l2tp_core.c | 34 ++++++++++++++++------------------ net/l2tp/l2tp_core.h | 11 +++++++++++ 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 62285fc6eb59..88efb8b845ca 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -730,11 +730,9 @@ void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb, "%s: recv data ns=%u, session nr=%u\n", session->name, ns, session->nr); } + ptr += 4; } - /* Advance past L2-specific header, if present */ - ptr += session->l2specific_len; - if (L2TP_SKB_CB(skb)->has_seq) { /* Received a packet with sequence numbers. If we're the LNS, * check if we sre sending sequence numbers and if not, @@ -1048,21 +1046,20 @@ static int l2tp_build_l2tpv3_header(struct l2tp_session *session, void *buf) memcpy(bufp, &session->cookie[0], session->cookie_len); bufp += session->cookie_len; } - if (session->l2specific_len) { - if (session->l2specific_type == L2TP_L2SPECTYPE_DEFAULT) { - u32 l2h = 0; - if (session->send_seq) { - l2h = 0x40000000 | session->ns; - session->ns++; - session->ns &= 0xffffff; - l2tp_dbg(session, L2TP_MSG_SEQ, - "%s: updated ns to %u\n", - session->name, session->ns); - } + if (session->l2specific_type == L2TP_L2SPECTYPE_DEFAULT) { + u32 l2h = 0; - *((__be32 *) bufp) = htonl(l2h); + if (session->send_seq) { + l2h = 0x40000000 | session->ns; + session->ns++; + session->ns &= 0xffffff; + l2tp_dbg(session, L2TP_MSG_SEQ, + "%s: updated ns to %u\n", + session->name, session->ns); } - bufp += session->l2specific_len; + + *((__be32 *)bufp) = htonl(l2h); + bufp += 4; } return bufp - optr; @@ -1719,7 +1716,7 @@ int l2tp_session_delete(struct l2tp_session *session) EXPORT_SYMBOL_GPL(l2tp_session_delete); /* We come here whenever a session's send_seq, cookie_len or - * l2specific_len parameters are set. + * l2specific_type parameters are set. */ void l2tp_session_set_header_len(struct l2tp_session *session, int version) { @@ -1728,7 +1725,8 @@ void l2tp_session_set_header_len(struct l2tp_session *session, int version) if (session->send_seq) session->hdr_len += 4; } else { - session->hdr_len = 4 + session->cookie_len + session->l2specific_len; + session->hdr_len = 4 + session->cookie_len; + session->hdr_len += l2tp_get_l2specific_len(session); if (session->tunnel->encap == L2TP_ENCAPTYPE_UDP) session->hdr_len += 4; } diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h index c2e9bbd79b35..7bef304de4f0 100644 --- a/net/l2tp/l2tp_core.h +++ b/net/l2tp/l2tp_core.h @@ -302,6 +302,17 @@ static inline void l2tp_session_dec_refcount(struct l2tp_session *session) l2tp_session_free(session); } +static inline int l2tp_get_l2specific_len(struct l2tp_session *session) +{ + switch (session->l2specific_type) { + case L2TP_L2SPECTYPE_DEFAULT: + return 4; + case L2TP_L2SPECTYPE_NONE: + default: + return 0; + } +} + #define l2tp_printk(ptr, type, func, fmt, ...) \ do { \ if (((ptr)->debug) & (type)) \ From patchwork Tue Jan 16 22:01:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 861916 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zLkjF1zGXz9s83 for ; Wed, 17 Jan 2018 09:02:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751477AbeAPWCX (ORCPT ); Tue, 16 Jan 2018 17:02:23 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:45351 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751182AbeAPWCU (ORCPT ); Tue, 16 Jan 2018 17:02:20 -0500 Received: by mail-wr0-f194.google.com with SMTP id 16so16827872wry.12 for ; Tue, 16 Jan 2018 14:02:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Y5ikfVgS5ZZ2nDFiXhfxj/PGAqimCSN+sIKhiWm0hkE=; b=bvwqwVh7uGdxvvawK6/WUrOQ32uqyVG/YeDHmYGdMu1m6ZEB6iuMQtILMMJbYXgT/Y FPfcMfTLibJ9dQ4/MaFVqC3af1o1+BKNA4aLfa8auMhL+gvpZ53y6haC8SvAy1BOnK84 g3tqUxuvhhg93CqB33tZ3mNRmyAUW45tsRMRZyHNJlIloEMQxkXaRV4ABDJMqPXtoBQD /WJudlAJHRmY+slsfmxxMPrqNaao8Jo1fJHG8Q1VT+OF2WGhK79w3Sh86CHHk+YBKrt6 Kn8Fuw0gH8v3TkudDa1VCREYLNU1vSbH8p2DYYco9//+QEhZQBfhHArV5qIiovUgcqKB A8yg== X-Gm-Message-State: AKwxytdjyxN7kWQFYHlB3cajL/KOweME4Iv692Q9YOvNfk2WtIWkiFoP Z4vXX1KtgOZ3K/nWcYITVjqklw== X-Google-Smtp-Source: ACJfBot8cemwRLI22TNbHEQ10P+VzLyEaX8Vnvoe48s6bonRYsyqwjam0n9LhSkArvPXNKrPCZADfw== X-Received: by 10.223.160.231 with SMTP id n36mr619145wrn.82.1516140139118; Tue, 16 Jan 2018 14:02:19 -0800 (PST) Received: from localhost.localdomain.com ([151.66.74.3]) by smtp.gmail.com with ESMTPSA id n6sm4905474wrn.76.2018.01.16.14.02.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jan 2018 14:02:18 -0800 (PST) From: Lorenzo Bianconi To: davem@davemloft.net Cc: netdev@vger.kernel.org, jchapman@katalix.com, g.nault@alphalink.fr Subject: [PATCH v3 net-next 3/4] l2tp: remove l2specific_len configurable parameter Date: Tue, 16 Jan 2018 23:01:56 +0100 Message-Id: X-Mailer: git-send-email 2.13.6 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove l2specific_len configuration parameter since now L2-Specific Sublayer length is computed according to l2specific_type provided by userspace. Reviewed-by: Guillaume Nault Tested-by: Guillaume Nault Signed-off-by: Lorenzo Bianconi --- net/l2tp/l2tp_core.c | 1 - net/l2tp/l2tp_core.h | 2 -- net/l2tp/l2tp_debugfs.c | 2 +- net/l2tp/l2tp_netlink.c | 4 ---- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 88efb8b845ca..194a7483bb93 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -1777,7 +1777,6 @@ struct l2tp_session *l2tp_session_create(int priv_size, struct l2tp_tunnel *tunn session->lns_mode = cfg->lns_mode; session->reorder_timeout = cfg->reorder_timeout; session->l2specific_type = cfg->l2specific_type; - session->l2specific_len = cfg->l2specific_len; session->cookie_len = cfg->cookie_len; memcpy(&session->cookie[0], &cfg->cookie[0], cfg->cookie_len); session->peer_cookie_len = cfg->peer_cookie_len; diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h index 7bef304de4f0..9bbee90e9963 100644 --- a/net/l2tp/l2tp_core.h +++ b/net/l2tp/l2tp_core.h @@ -59,7 +59,6 @@ struct l2tp_session_cfg { int debug; /* bitmask of debug message * categories */ u16 vlan_id; /* VLAN pseudowire only */ - u16 l2specific_len; /* Layer 2 specific length */ u16 l2specific_type; /* Layer 2 specific type */ u8 cookie[8]; /* optional cookie */ int cookie_len; /* 0, 4 or 8 bytes */ @@ -85,7 +84,6 @@ struct l2tp_session { int cookie_len; u8 peer_cookie[8]; int peer_cookie_len; - u16 l2specific_len; u16 l2specific_type; u16 hdr_len; u32 nr; /* session NR state (receive) */ diff --git a/net/l2tp/l2tp_debugfs.c b/net/l2tp/l2tp_debugfs.c index 2c30587d1a14..72e713da4733 100644 --- a/net/l2tp/l2tp_debugfs.c +++ b/net/l2tp/l2tp_debugfs.c @@ -181,7 +181,7 @@ static void l2tp_dfs_seq_session_show(struct seq_file *m, void *v) session->debug, jiffies_to_msecs(session->reorder_timeout)); seq_printf(m, " offset 0 l2specific %hu/%hu\n", - session->l2specific_type, session->l2specific_len); + session->l2specific_type, l2tp_get_l2specific_len(session)); if (session->cookie_len) { seq_printf(m, " cookie %02x%02x%02x%02x", session->cookie[0], session->cookie[1], diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c index 9ba2b8a68f65..405a5341ed1e 100644 --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c @@ -561,10 +561,6 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf cfg.l2specific_type = L2TP_L2SPECTYPE_DEFAULT; } - cfg.l2specific_len = 4; - if (info->attrs[L2TP_ATTR_L2SPEC_LEN]) - cfg.l2specific_len = nla_get_u8(info->attrs[L2TP_ATTR_L2SPEC_LEN]); - if (info->attrs[L2TP_ATTR_COOKIE]) { u16 len = nla_len(info->attrs[L2TP_ATTR_COOKIE]); if (len > 8) { From patchwork Tue Jan 16 22:01:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 861917 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zLkjM1GfPz9ryr for ; Wed, 17 Jan 2018 09:02:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751504AbeAPWC3 (ORCPT ); Tue, 16 Jan 2018 17:02:29 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36580 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751409AbeAPWCX (ORCPT ); Tue, 16 Jan 2018 17:02:23 -0500 Received: by mail-wm0-f67.google.com with SMTP id f3so11697974wmc.1 for ; Tue, 16 Jan 2018 14:02:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xsldwRpO3zNxl4E4WAmzFcx7eL7qSg3LqUe1raFG7Qw=; b=Do5Yrxc7g275L+ccNWklNo9Z+jQn0NKdE7RMnTexZrCIb0GZKXmhIkVrx7s9JGWU3A NAQRXhDAVsjEMK7f1NWRtZA8yhWwb+0rCLlTkGCr6DkhQRiC/bDdZsHvc8gX1BZP3XeH zWwifADBDeiuV/dgpd3sJ2EDrxJzAcKxDZElz1I1mR6ODrva2HM1OxVUwpfxgPTYPs8/ nTOpghoQbhA4Ts+5qIbzQFTOjuhAv/zRKc74nLcU1grnE+ZvatfDV9BVRA3I33724sDV L/WJGQ67FWgQ30AFQfX5EYo5q8z8SRSAB1VOebILj2dogUVXyatYNXAy+y6ZgqmguIwD nJ/w== X-Gm-Message-State: AKwxytfmJ4cfwFbt9sVqChasHGlc2bBNcrH0f1b7liNSkoJC3AFd5/z8 k399lcWaIQn4W+Z6IZx5d7PY/aVi+VU= X-Google-Smtp-Source: ACJfBosLwW75EY4kjtCE1kRpDWavr9qappnE3mUkriFPM4E9/KGmQctwU8JMXVBf2tRfHA2o4vovzw== X-Received: by 10.28.47.80 with SMTP id v77mr382045wmv.23.1516140141857; Tue, 16 Jan 2018 14:02:21 -0800 (PST) Received: from localhost.localdomain.com ([151.66.74.3]) by smtp.gmail.com with ESMTPSA id n6sm4905474wrn.76.2018.01.16.14.02.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jan 2018 14:02:21 -0800 (PST) From: Lorenzo Bianconi To: davem@davemloft.net Cc: netdev@vger.kernel.org, jchapman@katalix.com, g.nault@alphalink.fr Subject: [PATCH v3 net-next 4/4] l2tp: mark L2TP_ATTR_L2SPEC_LEN as not used Date: Tue, 16 Jan 2018 23:01:57 +0100 Message-Id: <4b9e89cab72bef9d833911e3a0c65253650bc039.1516138644.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Reviewed-by: Guillaume Nault Tested-by: Guillaume Nault Signed-off-by: Lorenzo Bianconi --- include/uapi/linux/l2tp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/l2tp.h b/include/uapi/linux/l2tp.h index 71e62795104d..7d570c7bd117 100644 --- a/include/uapi/linux/l2tp.h +++ b/include/uapi/linux/l2tp.h @@ -97,7 +97,7 @@ enum { L2TP_ATTR_OFFSET, /* u16 (not used) */ L2TP_ATTR_DATA_SEQ, /* u16 */ L2TP_ATTR_L2SPEC_TYPE, /* u8, enum l2tp_l2spec_type */ - L2TP_ATTR_L2SPEC_LEN, /* u8, enum l2tp_l2spec_type */ + L2TP_ATTR_L2SPEC_LEN, /* u8 (not used) */ L2TP_ATTR_PROTO_VERSION, /* u8 */ L2TP_ATTR_IFNAME, /* string */ L2TP_ATTR_CONN_ID, /* u32 */