From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3230508-1521475990-2-11423523211750200607 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1521475990; b=ZZi6ue2OupiF/UL6yIZl3rUYvbRUYzoFJZm/5R7oMU0+X8/ bXGmlQaPr08mhBuXKBWmd8doVNJQ8T/oBRjkIPVJNtvSHtmk2wuQehhFZD1N9hdw iA1hzC2uXf4I1M83+7feAaEY3vVa70RZxBKiFbm6oAiiuM0zLys9NPYM0VG5/4I0 CEIVWBiRIYfQF0D1L8X19QZfjAF481EKcS+ZbDdblvEOT95JjCAN03bQx0iWP0EN QzP7VQ80O/eEqJkmIwiVbimP1BTs4e995OE4JBBLcz+KcIivR56U6AE9hl1zu/JX i6nXma2DlbX0PWNxayyT1NwGcWfSSbyx/WLFIdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1521475990; bh=euH7PO 2ZhSy/7cknzymtzAspwAUCpGoIvHk/o/XdY6c=; b=uE+BqIWlgzS3B6Kr2z7OKJ srHYBDJwapKH3p5hdxavPHCMOU4ZZ078E47Qshp7Yz64Rp0s0Mfofcd5mx1VTSvw bLzqGHqtY21K9MbLVMJgDQN3jrUxuFpdM1qf8Cf6/K3A8Utmh5K6nw4Q4yHanSQG dGCpk1JEldXfWszJYB1eWXKsswmtHjCHeka7/hBZ8slPtcr/CiwIkU6JFLOPJqCE VIkkQL32Ckg0pKvynQEb2pOavw4QEJF7sP665862Zrvq/5xxk49bIjN6Cv98yg4T sG/Bs5uMNg1iVGcjMvS8MQXe/ah9lliGCd/JIb4ZxDnxCI7oH5xLD7qa9+kFdDxw == ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=K5PZAEgM x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-category=clean score=-100 state=0 spamcause=gggruggvucftvghtrhhoucdtuddrgedtgedrudefgdekheculddtuddrgedtfedrtddtmdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufhtfffkfhgjihgtgfggshhpjeesthhqredttddtudenucfhrhhomhepufgrshhhrgcunfgvvhhinhcuoeetlhgvgigrnhguvghrrdfnvghvihhnsehmihgtrhhoshhofhhtrdgtohhmqeenucfkphepvddtledrudefvddrudektddrieejpdehvddrudeikedrheegrddvhedvpdhfvgektdemmeefugelsgemjeelvgejmeelgegvsgemheguiedvnecurfgrrhgrmhepihhnvghtpedvtdelrddufedvrddukedtrdeijedphhgvlhhopehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhmrghilhhfrhhomhepoehsthgrsghlvgdqohifnhgvrhesvhhgvghrrdhkvghrnhgvlhdrohhrghequceuqfffjgepkeeukffvoffkoffgucfukfgkgfepjedvieeknecuvehluhhsthgvrhfuihiivgepvdek; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=K5PZAEgM x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-category=clean score=-100 state=0 spamcause=gggruggvucftvghtrhhoucdtuddrgedtgedrudefgdekheculddtuddrgedtfedrtddtmdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfhrghsthforghilhenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhephffvufhtfffkfhgjihgtgfggshhpjeesthhqredttddtudenucfhrhhomhepufgrshhhrgcunfgvvhhinhcuoeetlhgvgigrnhguvghrrdfnvghvihhnsehmihgtrhhoshhofhhtrdgtohhmqeenucfkphepvddtledrudefvddrudektddrieejpdehvddrudeikedrheegrddvhedvpdhfvgektdemmeefugelsgemjeelvgejmeelgegvsgemheguiedvnecurfgrrhgrmhepihhnvghtpedvtdelrddufedvrddukedtrdeijedphhgvlhhopehvghgvrhdrkhgvrhhnvghlrdhorhhgpdhmrghilhhfrhhomhepoehsthgrsghlvgdqohifnhgvrhesvhhgvghrrdhkvghrnhgvlhdrohhrghequceuqfffjgepkeeukffvoffkoffgucfukfgkgfepjedvieeknecuvehluhhsthgvrhfuihiivgepvdek; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966521AbeCSQNH (ORCPT ); Mon, 19 Mar 2018 12:13:07 -0400 Received: from mail-dm3nam03on0095.outbound.protection.outlook.com ([104.47.41.95]:57888 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966740AbeCSQNC (ORCPT ); Mon, 19 Mar 2018 12:13:02 -0400 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Hangbin Liu , Lorenzo Bianconi , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 3.18 050/102] l2tp: fix missing print session offset info Thread-Topic: [PATCH AUTOSEL for 3.18 050/102] l2tp: fix missing print session offset info Thread-Index: AQHTv50WUZsAB7MOIEOKnCgI2fPczw== Date: Mon, 19 Mar 2018 16:12:33 +0000 Message-ID: <20180319161117.17833-50-alexander.levin@microsoft.com> References: <20180319161117.17833-1-alexander.levin@microsoft.com> In-Reply-To: <20180319161117.17833-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1032;7:2pg9WXJpDOYAedAs6EQaUqC6iwkb3iscx/620yquPP5sb9UGbzL3Dy8WuX+5HtZx4sUKb3c++G1YwStndJziBwggaF+jD5VSIx1DzFKTlAyXQTgqrGHTl7rXZtqgKKiHX1BWZEApBujQjAtQiesgAPZYyngC7Lz9/kjh8+NvOeCgJZZ/zY22KJgMfzMlj1pKRfigo69gtlGQkBGm5j8OUQV1hCtRp+U9IiZ+wm902ZsQxOnBo9p2DEYyd5wxD6rh;20:wYkS9VunwdHnS+FYH4gYo+0GW/ZxlXBz/C3KKEukJ1GbVmWUDaXYGmtqlHFfVv23rBaM/8qAaAMJuaBeW5kgWjabiI5gdHyOPQGaewA8cLfbHSsj3C1x3OMx4NqNLx6EeCfpOvMHwRTLaaoDYkOzBh9AOL215nHdzSuZbCZULuc= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 14cd4235-60e4-4ce3-4121-08d58db446ae x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB1032; x-ms-traffictypediagnostic: DM5PR2101MB1032: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231221)(944501300)(52105095)(3002001)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123562045)(20161123558120)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB1032;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1032; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39380400002)(39860400002)(346002)(376002)(366004)(396003)(199004)(189003)(3660700001)(5250100002)(3280700002)(8936002)(3846002)(6116002)(1076002)(10090500001)(105586002)(72206003)(81156014)(8676002)(81166006)(2906002)(5660300001)(97736004)(2501003)(36756003)(6666003)(2900100001)(14454004)(6512007)(6436002)(2950100002)(39060400002)(53936002)(4326008)(54906003)(305945005)(6486002)(25786009)(68736007)(22452003)(316002)(6506007)(86612001)(66066001)(76176011)(102836004)(7736002)(10290500003)(110136005)(106356001)(99286004)(107886003)(26005)(186003)(86362001)(478600001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1032;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; x-microsoft-antispam-message-info: Mk8/u80mDk3ZjJaRmDr0b/HfGR1J3jVlFkssQSK9LElnqR+AdHhNSyjNdauC9I6D1LVOW0p7nq8eeOLM0kidit1nftT3jddE3vNSwj2nzpvoVvyKpARagJKtj/lQgD8DLs2qPEFmluqvaX/e+4OuKImmRCx9d73lrRdgSxszcB1epqzuWGYp2AMDwOyWFavcYan0mv03/9TySyqNWyokDmr07e9cO+EG56ppflD8ycL6r+gxbc4Xc+vfAATGuI26KW0yaJnpsrkKfwdBxHpttFBYauQzouy4do8fVvjXIKraDuRG+QDNaFzvWUPva5GSOfcvfgeB3aacoh78JYsr3Q== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 14cd4235-60e4-4ce3-4121-08d58db446ae X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:12:33.4037 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1032 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Hangbin Liu [ 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 Signed-off-by: Hangbin Liu Signed-off-by: Lorenzo Bianconi Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/l2tp/l2tp_netlink.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c index 0ac907adb2f4..9afeec7117e3 100644 --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c @@ -633,6 +633,8 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u3= 2 portid, u32 seq, int fl =20 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])) || --=20 2.14.1