summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorHangbin Liu <liuhangbin@gmail.com>2017-12-22 15:10:17 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-04-12 12:31:02 +0200
commite78a6e9aee5bed512e68b6793c739d51b37f93c9 (patch)
treee8241f99d308adf90e45fb4fc43c5151edc803ae /net
parentd8ffa7dfceb5fa5c4ddcd51639bbec759592ced2 (diff)
downloadlinux-stable-e78a6e9aee5bed512e68b6793c739d51b37f93c9.tar.gz
linux-stable-e78a6e9aee5bed512e68b6793c739d51b37f93c9.tar.bz2
linux-stable-e78a6e9aee5bed512e68b6793c739d51b37f93c9.zip
l2tp: fix missing print session offset info
[ Upstream commit 820da5357572715c6235ba3b3daa2d5b43a1198f ] Report offset parameter in L2TP_CMD_SESSION_GET command if it has been configured by userspace Fixes: 309795f4bec ("l2tp: Add netlink control API for L2TP") Reported-by: Jianlin Shi <jishi@redhat.com> Signed-off-by: Hangbin Liu <liuhangbin@gmail.com> Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/l2tp/l2tp_netlink.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c
index a1f24fb2be98..7e9c50125556 100644
--- a/net/l2tp/l2tp_netlink.c
+++ b/net/l2tp/l2tp_netlink.c
@@ -761,6 +761,8 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 portid, u32 seq, int fl
if ((session->ifname[0] &&
nla_put_string(skb, L2TP_ATTR_IFNAME, session->ifname)) ||
+ (session->offset &&
+ nla_put_u16(skb, L2TP_ATTR_OFFSET, session->offset)) ||
(session->cookie_len &&
nla_put(skb, L2TP_ATTR_COOKIE, session->cookie_len,
&session->cookie[0])) ||