From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3190956-1523476360-2-4000675374769623183 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= 1523476358; b=jdZZIStSnW1Pn06idawceuqyNnXjK8hZTRJ7sTElhe7pQIlrlj bHXgd1kxSaVGy6d5eAQf7eWhvLc4s5YpDz1m3lDWhQR8Xr/lNZTFAaZuQ+Q1+8IJ /vxydezWFFcpRixqV4eZpwQFQ4jDNcnhtylJ19DBMCqCTRjo0HmBtGjIuzy8fAkb 02z2DB7cNbPmyoh7d43djh4jL1zGUbDaoiFPVwAuSRDmE7IPTEPb0fpl3FOae94P eA065zPzWajB63SdCSPItrbd3LUqqr/AMHym9WBFx7Vk05xrspWtvAZa0ZmK8djI jozughY0BiOF8QlMO+25PeOedggZ2/25okuQ== 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=1523476358; bh=SQ+gK9DpIXybjo1jFc2RZ6IXgD9FFr fUDZMNslHP8N8=; b=oiIbpA5C9lE2iCtMjqbUWv5VhXWsGlzNYZwjMy/F0k0b4L aRB0ywi0I6XFTuLYsdQ7+hTWJj/ny/BGS1I9QhFlWjSwM+5e8URo6tsYYGDiMij2 dx1KzJV9qiBpNbnsjkL/mKE2xUvywWWSc4uxtPpAuzRrrVF4AALX+R+62nHRzucF qkxxTVDFHfCDwaw1tyoweDZ6zjWYOyTQcEGr9Q0+Lw6dY/fPSqkk4ui3+gVoWyhy L5dPy3inAAf/Zpno41GEQtuPVGmrdLVMMxd3u/agSqy+8kuXL3sxGH/xYUSENcL/ Xz0gxYonBt0McpMChBCerza+RGv2pxSKp27Gi2ag== ARC-Authentication-Results: i=1; mx1.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: mx1.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: MS4wfFXsvBzkoarMi47hvRHwb/DvhsUcMK6Sq8RXRFVoopVk8WQ5LR7mBaIxjNQkGKbw5VDH9uoOxsm1pTTY9JCSf3QY2ppoll9IOEFGXSEMGb3VIHPFiIfA sSSL36xcTByXN1RCsgQjfAt9QIeJ95coYUPStZwdg1BTiCYhLZBIKQU3b84FvPc7g38fQ9E1WzW2oc+u1DKLe/Ke3xOfdBdrbeJUMvLDCAs2/QA/wj8SiKra X-CM-Analysis: v=2.3 cv=WaUilXpX 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 S932285AbeDKTwW (ORCPT ); Wed, 11 Apr 2018 15:52:22 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:36532 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933308AbeDKS6G (ORCPT ); Wed, 11 Apr 2018 14:58:06 -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 4.9 124/310] l2tp: fix missing print session offset info Date: Wed, 11 Apr 2018 20:34:23 +0200 Message-Id: <20180411183627.613979628@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183622.305902791@linuxfoundation.org> References: <20180411183622.305902791@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: 4.9-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 @@ -750,6 +750,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])) ||