From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz2-f41.google.com (mail-pz2-f41.google.com [74.125.228.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 253E72F28FC for ; Wed, 23 Sep 2026 00:37:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790123831; cv=none; b=I+JMQ4Aeeu2pxbdknFC7WB8cL+9+dsyBEEf6JmGiq5+i3Z1FYH8g5CycSd5j1XAm4oAu990c9X3oq0WGajbx8E8jW2aX8KxSQ+HGrrfTgvbRozJCjVTUh/1joWr9N257vLrV8B2eXVFHjifJky+TKA7sez1UhFOqGmC65fzaA9A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790123831; c=relaxed/simple; bh=EbcJkqAUsR125AsGOm6uKZ0BhA9adZV84zXsqa1i6mA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=i+TQ3adEghKNSt2Rd8O+KS5vIXB0USI98PZNWK4iAA9xaTg2EswjZdjJeg69+gRbkdjj2F7KVXEFr0gdErB8pKpPbNpqLh5Wk0CIBDJSkxVg1dRsutA1p0SnLeNSZqyog891o5eY2yjZnZ1Hm4tNjsEv++CvPkf6S4qxL8FiH6o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=P98Wr6Xi; arc=none smtp.client-ip=74.125.228.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P98Wr6Xi" Received: by mail-pz2-f41.google.com with SMTP id d2e1a72fcca58-868a9c48f9eso375794b3a.3 for ; Tue, 22 Sep 2026 17:37:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790123829; x=1790728629; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=3jWT/lp+R/Tlkfp+3AKgblbjp5barctUrxy33CjiCvo=; b=P98Wr6Xie/MCpG4SEXPluyKf33BZ/UVaBzX3WWsy84oHo6F7sHO3KXt0pjSTUwP7xS 6h9at34tW5lH3Sqg2v2kCFLa+rF/W8qbmMqpt/mXMtmL7iUjHdbzzn4ZZlZCVAYLXvhl BYolK6WOgmE7giXKU1IoIFYJROXKdjMNrHzqIpzg4ZRwwa6POWxAUfErRmubTvwS7+Xc Eeihwjib7V6iSTwvmipyjiINIoYVrWLg9jr61apECLtMeN5JUlw/ruRC662IS9w885mO 0y/wko6H7hvfuu0XP+OtK9R7MlT8nFVvkfxAZEETm7Zy+qwpKfRUzusvXzluFJzE3KEt rF6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790123829; x=1790728629; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=3jWT/lp+R/Tlkfp+3AKgblbjp5barctUrxy33CjiCvo=; b=HBQilcuP+TjMIir7KQJ8oL6MPCnpA7GPo7dQhjzcPuv7QREOMtyxD2Fl7PwrgNPNto Av8PieiCg8Ddme8gHRN4Dj2ffA/5wiqstWCV5/AjXoWw9FhrgsvVTZ+epVstYux8r6Qp BcGIlpbkiDT7nrJEG4krSrWs0EwmGKCxGVuKk91+GnUypSXJIeKU0yzRiF/7o0+YVi/j pOpGkj0qajVOhPQxgId9y9bxS9lBNNaoQ1tQD1ru4Z+Bs/gmRcl46G5yz82NDvFy4avw 8nV14DW8JxNftoipJB92jVWatSS1bBUrBxqo3j5OTNsbXdlfPWdeeOP1p1lTrAfuKN3G co7g== X-Forwarded-Encrypted: i=1; AKwUvByifU1hBsy6UUhX6JG64lduuF3t5FXU83oxHp/QogvZWaYUO8E9J/UOMqsnfhFFDnWZyCKKPVVoGp7WgLw=@vger.kernel.org X-Gm-Message-State: AFuF++k/d0SPFFUIqk521R1+fJa1E+bMQ/li4XVCCtjpPLZMGepD0d3d 96OEBaojMf1OOfTu0jRiux3mXNKPZCvjCjUUOcMOFmwy+yoHVTGt/2AF X-Gm-Gg: AYBFou2Xtnbp0udj34QLSQl6eojbxMuB5htvM7S4iTMh9l04l2cFihaaNK5wCRhilDx otqFmlfPS9djd9OnNxvP1M1jOsoyG1bUUP9WUOfVVde/0CWH+mOn8zabIADw7QXyVXfI7DlhsUr OaMcwmpYp8737ssLfDXp7xgI98NycNOwphGox2zfGLKlylM6EJiQW+MG1Bt5FXrCpcz+bOS1+iB M1E6w8MsopzbClQKdkpV4dITJBq4uX87FPk59R9KHaIUp3gLqu4mtE4iVBDLWRyt7Z+bzvNY8PH yAN8yG9rkyHxewQkp/7LCoFQCe+dM3uazmRPU8Whf6TqJHH06maN3EMuJtbGOW4qSt8qhY9Qclb lwCqSQNy4wEyEI5w0Eh3/AgyvO7wdLkeKUj6i1AoX+I9k4E8/Houq8raBC4yg1H+xv5DFLCe5uz HrpIDt59PWzYkdLz9QoJxaOwnt9WnVnAudHW9woOYxlYsKMiCrOi4/7uDl9aWDQFiXYPgyLSYmq T3pM/FBE2c= X-Received: by 2002:a05:6a00:3c86:b0:878:3783:8a8a with SMTP id d2e1a72fcca58-87d1dde2ffamr1087891b3a.54.1790123829429; Tue, 22 Sep 2026 17:37:09 -0700 (PDT) Received: from [163.43.103.131] ([163.43.103.131]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87d1dff9778sm427895b3a.49.2026.09.22.17.37.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 17:37:08 -0700 (PDT) From: Yuya Kusakabe Date: Wed, 23 Sep 2026 09:36:57 +0900 Subject: [PATCH net 2/4] xfrm: lwtunnel: accept RTA_ENCAP without NLA_F_NESTED Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260923-lwt-encap-noflag-v1-2-8de7ab6c86e9@gmail.com> References: <20260923-lwt-encap-noflag-v1-0-8de7ab6c86e9@gmail.com> In-Reply-To: <20260923-lwt-encap-noflag-v1-0-8de7ab6c86e9@gmail.com> To: David Ahern , Ido Schimmel , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Justin Iurman , Alexander Aring , Steffen Klassert , Herbert Xu , Nikolay Aleksandrov , Eyal Birger , Nicolas Dichtel , Xin Long , Shuah Khan Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Yuya Kusakabe X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1299; i=yuya.kusakabe@gmail.com; h=from:subject:message-id; bh=EbcJkqAUsR125AsGOm6uKZ0BhA9adZV84zXsqa1i6mA=; b=owEBbQKS/ZANAwAIASrX0XUqXRtNAcsmYgBqsx8pbycS0xTOF+rGUkGurYGp4Ki+GssAR/lwC wNJEjCLWGGJAjMEAAEIAB0WIQTaB7usAfxNKMeqa6Yq19F1Kl0bTQUCarMfKQAKCRAq19F1Kl0b Tf7QD/0bfigNdYJ/Eb5oQOcvab12OHdvsLB2IgXftugNDtbYezhZfzSwybDssg+ldzqjhFOOA1P pNzC6A0y1wPGFffcMepDjYH+RdH631eA8ce3cbckRsN02ncQBqkhvGSWkjyubId+NI6MQDN9zhK ZcE9DEiQDkLeXugF2oxz4qXQ7dlU5cGWd50td4B8DCs4jrttrn12Ipa+IIenHnVA9GJ+97c3po+ hOmHk0WmDkboteJ+GAXVtq1m7WyOdz5ievXSUs24lQSJ2yHNk14LpdYihIIO+OpqfD9RFc3sfms 8/g0DswPc4ufeeaBQGcp9ze13NG51lZPnayx/PQa2+PZ6tCQve95Ukz/OAcvpOT199N8LYL9Pb8 6pDZlzU0ueBHBkxMVtVNZSh/rtcfQmcw5rybotR75+9CqjULhjNumQ5nwrjm/JHrwsOxrP2K5Xe +YSvXnr1jhBjtizuoONPUrl/EMXZYxenSgMq9G3lqRiU//B15Iilh0SUFziSHuk9FI7uoP5ZiWr F1ASWbOGXHNbgZH8r+CH+AkYvedy89dKtd9jmjDdsfSabt4EH5R50PpqUJ9knlNvMlsgdaGXMJl SkIL8pp5Un2Dnrr4bQjWKBwNp5zDnxJAfn0DQKPnbvXyv0n15klTCqli91MaJdALHfnx5rC4KvQ I8I5SANjcjWiIRA== X-Developer-Key: i=yuya.kusakabe@gmail.com; a=openpgp; fpr=DA07BBAC01FC4D28C7AA6BA62AD7D1752A5D1B4D xfrmi_build_state() parses RTA_ENCAP with nla_parse_nested(), which requires NLA_F_NESTED, but lwtunnel_fill_encap() dumps RTA_ENCAP without it. As a result, "ip route restore" cannot restore the routes saved by "ip route save": # ip -6 route add 2001:db8:3::/64 dev ipsec0 encap xfrm if_id 1 # ip -6 route save 2001:db8:3::/64 > route.bin # ip -6 route del 2001:db8:3::/64 # ip -6 route restore < route.bin Error: NLA_F_NESTED is missing. Use lwtunnel_nla_parse(). Fixes: 2c2493b9da91 ("xfrm: lwtunnel: add lwtunnel support for xfrm interfaces in collect_md mode") Assisted-by: LLM Signed-off-by: Yuya Kusakabe --- net/xfrm/xfrm_interface_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/xfrm/xfrm_interface_core.c b/net/xfrm/xfrm_interface_core.c index 688306bf62c5..2fcfbfac315a 100644 --- a/net/xfrm/xfrm_interface_core.c +++ b/net/xfrm/xfrm_interface_core.c @@ -80,7 +80,8 @@ static int xfrmi_build_state(struct net *net, struct nlattr *nla, struct xfrm_md_info *info; int ret; - ret = nla_parse_nested(tb, LWT_XFRM_MAX, nla, xfrm_lwt_policy, extack); + ret = lwtunnel_nla_parse(tb, LWT_XFRM_MAX, nla, xfrm_lwt_policy, + extack); if (ret < 0) return ret; -- 2.50.1