From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A3FE17592; Tue, 30 Apr 2024 11:25:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714476330; cv=none; b=lOyPB4NUOPimQjt1x++b6YvCP6j2DW9dJq2A0C0JoTg5TjrfF4qtUG8shE+Voy8KuOgF3qJaTIyqweqr4oCnG3H70sJvnyOR4cY2TzgOB7pA7yoJw+mHHBTVR9jtcQejeYSG0VhDvE07WCyixD14KclVno7NDgR4u9Zqa2pKMVw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714476330; c=relaxed/simple; bh=VrTrHh6tgtxitncQ5mznkLhTiVldJ8nhtMjWDzNVUEE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YfK8OkP2nNBoO2VoytarFhx9o9u/WbYnChl+N3tses2jg8RB9ib29FwJoBSszs2Wym6JPlcdSQbnXsOh++g8e8aoGcEGT6G0TjSSsEJlwTSfHDuJY23MHcAPdb5AegTIUsIdavFiHIIaHEF+BBo6S+pi9CogJ5EMWxTp5kLCYQQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Nm+ZaK7j; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Nm+ZaK7j" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AFFF7C2BBFC; Tue, 30 Apr 2024 11:25:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1714476330; bh=VrTrHh6tgtxitncQ5mznkLhTiVldJ8nhtMjWDzNVUEE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nm+ZaK7jvmA8yHwuA7YvK80k8edfJHxvZXlsp/xInrOvxbrg3DxcTVH91McFKkvkR HTdoC6Hz1Y6JyqqsvFnG2o5v7+v33Bknv4mzE2HHj3EJMbrpgKl3jQ1JejZfdjh3QG I948kNISoYCSvpm2riZ9R2A8uayWnV5HS4YhyudY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yick Xie , Willem de Bruijn , Jakub Kicinski Subject: [PATCH 5.4 106/107] udp: preserve the connected status if only UDP cmsg Date: Tue, 30 Apr 2024 12:41:06 +0200 Message-ID: <20240430103047.786196673@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430103044.655968143@linuxfoundation.org> References: <20240430103044.655968143@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yick Xie commit 680d11f6e5427b6af1321932286722d24a8b16c1 upstream. If "udp_cmsg_send()" returned 0 (i.e. only UDP cmsg), "connected" should not be set to 0. Otherwise it stops the connected socket from using the cached route. Fixes: 2e8de8576343 ("udp: add gso segment cmsg") Signed-off-by: Yick Xie Cc: stable@vger.kernel.org Reviewed-by: Willem de Bruijn Link: https://lore.kernel.org/r/20240418170610.867084-1-yick.xie@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Yick Xie Signed-off-by: Greg Kroah-Hartman --- net/ipv4/udp.c | 5 +++-- net/ipv6/udp.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1054,16 +1054,17 @@ int udp_sendmsg(struct sock *sk, struct if (msg->msg_controllen) { err = udp_cmsg_send(sk, msg, &ipc.gso_size); - if (err > 0) + if (err > 0) { err = ip_cmsg_send(sk, msg, &ipc, sk->sk_family == AF_INET6); + connected = 0; + } if (unlikely(err < 0)) { kfree(ipc.opt); return err; } if (ipc.opt) free = 1; - connected = 0; } if (!ipc.opt) { struct ip_options_rcu *inet_opt; --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -1387,9 +1387,11 @@ do_udp_sendmsg: ipc6.opt = opt; err = udp_cmsg_send(sk, msg, &ipc6.gso_size); - if (err > 0) + if (err > 0) { err = ip6_datagram_send_ctl(sock_net(sk), sk, msg, &fl6, &ipc6); + connected = false; + } if (err < 0) { fl6_sock_release(flowlabel); return err; @@ -1401,7 +1403,6 @@ do_udp_sendmsg: } if (!(opt->opt_nflen|opt->opt_flen)) opt = NULL; - connected = false; } if (!opt) { opt = txopt_get(np);