From: Sam Protsenko <semen.protsenko@linaro.org>
To: James Chapman <jchapman@katalix.com>,
"David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Guillaume Nault <g.nault@alphalink.fr>
Subject: [PATCH 1/2] l2tp: Bring back ->flags to struct pppol2tp_session
Date: Fri, 14 Dec 2018 23:12:41 +0200 [thread overview]
Message-ID: <20181214211242.9721-1-semen.protsenko@linaro.org> (raw)
Flags field will be used in further commits (e.g. for keeping
SC_COMP_PROT), so let's bring those back. This commit effectively
reverts commit 1998b5ed9c9b ("l2tp: drop ->flags from struct
pppol2tp_session"), with some cosmetic changes.
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
---
net/l2tp/l2tp_ppp.c | 52 +++++++++++++++++++++++++++++----------------
1 file changed, 34 insertions(+), 18 deletions(-)
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index c03c6461f236..145435977b21 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -125,6 +125,7 @@ struct pppol2tp_session {
* PPPoX socket */
struct sock *__sk; /* Copy of .sk, for cleanup */
struct rcu_head rcu; /* For asynchronous release */
+ int flags; /* accessed by PPPIOCGFLAGS */
};
static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb);
@@ -1074,44 +1075,60 @@ static int pppol2tp_ioctl(struct socket *sock, unsigned int cmd,
{
struct pppol2tp_ioc_stats stats;
struct l2tp_session *session;
+ struct pppol2tp_session *ps;
int val;
+ bool is_tunnel;
+
+ session = sock->sk->sk_user_data;
+ if (!session)
+ return -ENOTCONN;
+
+ ps = l2tp_session_priv(session);
+ is_tunnel = !session->session_id && !session->peer_session_id;
switch (cmd) {
case PPPIOCGMRU:
- case PPPIOCGFLAGS:
- session = sock->sk->sk_user_data;
- if (!session)
- return -ENOTCONN;
-
/* Not defined for tunnels */
- if (!session->session_id && !session->peer_session_id)
+ if (is_tunnel)
return -ENOSYS;
if (put_user(0, (int __user *)arg))
return -EFAULT;
break;
+ case PPPIOCGFLAGS:
+ /* Not defined for tunnels */
+ if (is_tunnel)
+ return -ENOSYS;
- case PPPIOCSMRU:
- case PPPIOCSFLAGS:
- session = sock->sk->sk_user_data;
- if (!session)
- return -ENOTCONN;
+ if (put_user(ps->flags, (int __user *)arg))
+ return -EFAULT;
+ l2tp_info(session, L2TP_MSG_CONTROL, "%s: get flags=%d\n",
+ session->name, ps->flags);
+ break;
+ case PPPIOCSMRU:
/* Not defined for tunnels */
- if (!session->session_id && !session->peer_session_id)
+ if (is_tunnel)
return -ENOSYS;
if (get_user(val, (int __user *)arg))
return -EFAULT;
break;
+ case PPPIOCSFLAGS:
+ /* Not defined for tunnels */
+ if (is_tunnel)
+ return -ENOSYS;
- case PPPIOCGL2TPSTATS:
- session = sock->sk->sk_user_data;
- if (!session)
- return -ENOTCONN;
+ if (get_user(val, (int __user *)arg))
+ return -EFAULT;
+ ps->flags = val;
+ l2tp_info(session, L2TP_MSG_CONTROL, "%s: set flags=%d\n",
+ session->name, ps->flags);
+ break;
+ case PPPIOCGL2TPSTATS:
/* Session 0 represents the parent tunnel */
- if (!session->session_id && !session->peer_session_id) {
+ if (is_tunnel) {
u32 session_id;
int err;
@@ -1136,7 +1153,6 @@ static int pppol2tp_ioctl(struct socket *sock, unsigned int cmd,
if (copy_to_user((void __user *)arg, &stats, sizeof(stats)))
return -EFAULT;
break;
-
default:
return -ENOIOCTLCMD;
}
--
2.19.1
next reply other threads:[~2018-12-14 21:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-14 21:12 Sam Protsenko [this message]
2018-12-14 21:12 ` [PATCH 2/2] l2tp: Add Protocol field compression Sam Protsenko
2018-12-16 16:30 ` Guillaume Nault
2018-12-16 18:46 ` Sam Protsenko
2018-12-16 19:33 ` Guillaume Nault
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181214211242.9721-1-semen.protsenko@linaro.org \
--to=semen.protsenko@linaro.org \
--cc=davem@davemloft.net \
--cc=g.nault@alphalink.fr \
--cc=jchapman@katalix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).