From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3397032-1523481371-2-14005008960063824774 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, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' 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=fm2; t= 1523481370; b=TjUWUQG8m95atigvd132+9AWOjprGQ9aR4cR99B5V08iYwvwIy oyf7Mf8O5qfK/lVLqlhhEMeMO7+qdrGYZ4obzajYfBOwmKfVsDh0I2Q+fk4xl1pf UQqEQR1hNdu0NssgEsjlgos/4M9v2ca7WjomgAGbjsg+fCp915O3xN1734H7Qig/ eBYsX2Gidhb5s/4IZJzl3O6IolpwkcuHYbfHKvblzTRrCIqNilZHYHNy2ir9WrH5 kNiXVKEVNEJg+HBIgtVk7aCc7AKdNgHIHsyTkb1H1sQsiOu+Bee9RufxFKsJ4Mfb g61xlYfRN9bKVVTkVO51naR7NJ7+1CwEdaEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523481370; bh=oWxOuguhYRMG9x1+B9GNY/iXCiiUgP 8hdDus6/Ixb/g=; b=iodttiYb4m00PUKXnpPG0SBC5bpnan+40kBbqrgNHHy3l9 BEqNoYl9fx0tP1ro+/EPqud4igFlMieqn78EuFiSF3Nr7d8MmVRCGu5e03IosKGU HT8QYtTgJX0JpchH1o0CxOcRBLTyv6HdlTEfUDfN8ZJfoq26w4gsgI1xpyVaS6rc Fyzl1eeuw8UfmlIF8QI4IFXDxtq+NAXSadud8tzsveMJ/FpBZuQEX0it2D39pbGe 7peng2ZO355+Yk1nw7fLZpGlNROsPs0WUAePuSdRd6TYU11A8lLCLcjtZ6Q/GMZh JnvoSbKaUoZrKsMcf0bwMZ+AvVVKe3ovyYd2EfEQ== ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; 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-cm=none score=0; 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=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; 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-cm=none score=0; 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=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfNdTn3G3hZIPRC212U7MxtVbYr459ksvTRybn0wP6Sz4Jqx1uXZa2fNMTXfTX7RYtUqGbEZ2IniJ9XhzUc99QhSRxruyhRYF9ntuOw6/hlpT9xY1Tf0N Oa8SAIJayrw7Ujs99gpRitwyVKi6NKe1OBuzKS+NBHkkfHhD3CkhnaXy2v+Bfp7tbV0ezOmM4Oin8QPDVv6RzBGxWFFCO/F4gArIpEvn+kDc/p/RscQO0R2g X-CM-Analysis: v=2.3 cv=E8HjW5Vl c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=pGLkceISAAAA:8 a=20KFwNOVAAAA:8 a=J1Y8HTJGAAAA:8 a=yMhMjlubAAAA:8 a=ag1SF4gXAAAA:8 a=7CeojBlomD8Mbgo6nkQA:9 a=QEXdDO2ut3YA:10 a=y1Q9-5lHfBjTkpIzbSAN:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754703AbeDKSkp (ORCPT ); Wed, 11 Apr 2018 14:40:45 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:56542 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754698AbeDKSkn (ORCPT ); Wed, 11 Apr 2018 14:40:43 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jianlin Shi , Hangbin Liu , Lorenzo Bianconi , "David S. Miller" , Sasha Levin Subject: [PATCH 3.18 049/121] l2tp: fix missing print session offset info Date: Wed, 11 Apr 2018 20:35:52 +0200 Message-Id: <20180411183459.330060369@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183456.195010921@linuxfoundation.org> References: <20180411183456.195010921@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ 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 Signed-off-by: Greg Kroah-Hartman --- net/l2tp/l2tp_netlink.c | 2 ++ 1 file changed, 2 insertions(+) --- a/net/l2tp/l2tp_netlink.c +++ b/net/l2tp/l2tp_netlink.c @@ -633,6 +633,8 @@ static int l2tp_nl_session_send(struct s 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])) ||