From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-vs2-f21.google.com (mail-vs2-f21.google.com [74.125.227.21]) (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 E627E32E6BC for ; Sat, 12 Sep 2026 01:32:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.21 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789176770; cv=none; b=MSx1nFn6pjybfLZ52v58jz6+BKfmG1y432Ms6GoTV8hZP/QBEPqQtQT3bIq314mMvIkHvL6Rz6Fs/yWCmqNE+Xst96+mY70hnanlL8bUbFSB1OfRtXpbjSnG/Yx/GCEyFmGxSO0Hj+bsVgSXnCI6ZtHjsPQsdQmWec/1ABd4/jA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789176770; c=relaxed/simple; bh=kpA9tAq2EBytkId5UijebMKqKh1ZAIkgS5SlLkuCrrs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XLwFObP3NnHPEEoxypGGcrTHq6vEPK8LBV3+RQ786WwKQEtl2rhIP4pO0oImCFxsyATyO8KB7QbW2WhYJn+pg79IlUAHl3hXKo2SurHZYMi98NHg6ZDcujx5sqgL1v4bltgNAtrzxXQyI/fMJ5W/dLzf98gT/TEsYbRHzy74jN8= 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=GK9aTWsR; arc=none smtp.client-ip=74.125.227.21 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="GK9aTWsR" Received: by mail-vs2-f21.google.com with SMTP id 71dfb90a1353d-5c83397eeeeso130246e0c.2 for ; Fri, 11 Sep 2026 18:32:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789176767; x=1789781567; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=DjS+5MZMCkJIeLNwvKtXeWsQ51wgDnQ0oyyAygIt+Vg=; b=GK9aTWsRLbUJqbtPopPpOnUiL5s+JD1R1atRlagB/2lbXvpRhWT0bWaOJbrPcld+s6 iwNisdwDPRS8G3ni6+Sjtq1sDfys6kQKhZ498ewYVbAejoB9ulCBPZUnA+YvoIir/UQk lC8Kw6jktDrYD2GbbX5MxH4OZvkNLfePTkeB56Lh1q62iCUgFVpeO4yluIWZen06pp7J /Q/yFnGVzOzDDH96Gna5HX7ZF2wZCQNTihApJTcbbjLhwtxpB9n0nKxC/iUqXrAXcxUM mwSxFUpk3ELjoW1M4x4aZ2Hc6DppO1lCx3yns8QdbvhpmgdfGjLXtuN9G2d8Ff1/ZLKe UYWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789176767; x=1789781567; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=DjS+5MZMCkJIeLNwvKtXeWsQ51wgDnQ0oyyAygIt+Vg=; b=XWHYEz9DXgqISAqPI9l9iCK9ATIWvQ1F+ztuhfRQx0/nmQndpEzCOf7mNwy2grNw4k 1w0tIpo5TgqO+7MKNACsNjEF41UFGeVb0S/X4DmLCajXDSz5iodmNAs9+XTleQ8UzhCv Mhd9jxdsHcicj5DcbLvS5nnsfDhAIzSE/uGHSIFW1vqlmFDhSZ3qWUetIrFjLcuQLnqg SuipYx6g6/76/vBvgZwL3aDgrstN6u5xMqNDl5wZVzfrBO8DXU3ODkMo/DWqzF67ybN6 +/w/Hwo/+OViGyX3wz/f3b8gNNfua+1yqzqJW63OFKZDmceOtgIxLPS+Kuzd64Zlv0gn hBAQ== X-Forwarded-Encrypted: i=1; AKwUvByGqdDvrpTBMkAjGjsolwZ4ludB4P03Qex+CJryMRYQg3Oqy3I3sWIGjIbcm8WIvs9za1qEBW2XMtEYdk4ZsiI=@vger.kernel.org X-Gm-Message-State: AFuF++lDi7/5AZm9GvrlVCxwEqwLLuCpZmbdwTj0EpvtcwttwJSbNUPm zy1w4d3qV16QRibXokIvESnp16QJfyZTCeXTg7uW0omsWvOVWk5MQcXQ X-Gm-Gg: AYBFou3JTEl8JeHy/21wHGwfNdm4rDVUoBHgUhA6RAwQAxbuLylQ+0WA+GoR3KTPLRQ yG66YrmzWcKiX9d5km2xWuIBQyz2L2jxrh9abMPahG8z/ghuonvu11XgDQ297B9xHZDLG1+sfoM pTqZ4DLZmJUI+rpyRJQ2/M4srn1CS0Zpa21oTQdmJgy+U6jevYWT1X62xixEBfTUQoE67pLzknJ qKtS71FoN3vaEBSPO+YOqlwA583IEEuDxPdw9pJK5zRrvjJvHahEvJqVldlzHVt3beATXiSUjJl 3ghRMT/Jz+OOOEHG9Lsj8/kFAbC6fUY5/NBkBK3pITgYjjJL8aAkeM7UugOfE00CRAL5ggmRzHw SfbeI+3CSsalOI5ShRdszI4cORMUrKgK2FAWsUQhfCecBNpfzk/s4vbNok1nZlBoW7Bxto+pMwA XIKZJljuggizYYvzIr1etuQBF5tJ7sEkuH8zB4eAoboOAxgigpVby9RHfs3s6Kq4o= X-Received: by 2002:a05:6122:17aa:b0:5c6:8480:35c8 with SMTP id 71dfb90a1353d-5c965eec205mr576062e0c.8.1789176766750; Fri, 11 Sep 2026 18:32:46 -0700 (PDT) Received: from adriano ([190.215.95.120]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-5c84714c380sm4738262e0c.15.2026.09.11.18.32.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2026 18:32:46 -0700 (PDT) From: Adriano Cordova To: Simon Horman , Julian Anastasov Cc: Pablo Neira Ayuso , Florian Westphal , Phil Sutter , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , netdev@vger.kernel.org, lvs-devel@vger.kernel.org, netfilter-devel@vger.kernel.org, Adriano Cordova Subject: [PATCH 2/4] ipvs: stamp per-service secure_tcp on new connections Date: Fri, 11 Sep 2026 22:32:14 -0300 Message-ID: <20260912013216.588300-3-adrianox@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260912013216.588300-1-adrianox@gmail.com> References: <20260912013216.588300-1-adrianox@gmail.com> Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Set the IP_VS_SVC_F_SECURE_TCP capability into IP_VS_CONN_F_SECURE_TCP when a connection (or a persistent template) is created for a service. FTP data channels are created by the ftp app separetely, outside the paths above, so propagate the flag from the control connection. Signed-off-by: Adriano Cordova --- net/netfilter/ipvs/ip_vs_core.c | 23 +++++++++++++++++++---- net/netfilter/ipvs/ip_vs_ftp.c | 8 +++++--- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c index ba0957798bad..eead1b992dd9 100644 --- a/net/netfilter/ipvs/ip_vs_core.c +++ b/net/netfilter/ipvs/ip_vs_core.c @@ -52,6 +52,13 @@ #include +/* Encode the per-service secure_tcp capability into a connection flag */ +static inline unsigned int ip_vs_conn_secure_tcp_flags(struct ip_vs_service *svc) +{ + return (svc->flags & IP_VS_SVC_F_SECURE_TCP) ? + IP_VS_CONN_F_SECURE_TCP : 0; +} + EXPORT_SYMBOL(register_ip_vs_scheduler); EXPORT_SYMBOL(unregister_ip_vs_scheduler); EXPORT_SYMBOL(ip_vs_proto_name); @@ -546,7 +553,9 @@ ip_vs_sched_persist(struct ip_vs_service *svc, * and thus param.pe_data will be destroyed * when the template expires */ ct = ip_vs_conn_new(¶m, dest->af, &dest->addr, dport, - IP_VS_CONN_F_TEMPLATE, dest, skb->mark); + IP_VS_CONN_F_TEMPLATE | + ip_vs_conn_secure_tcp_flags(svc), dest, + skb->mark); if (ct == NULL) { kfree(param.pe_data); *ignored = -1; @@ -567,6 +576,7 @@ ip_vs_sched_persist(struct ip_vs_service *svc, flags = (svc->flags & IP_VS_SVC_F_ONEPACKET && iph->protocol == IPPROTO_UDP) ? IP_VS_CONN_F_ONE_PACKET : 0; + flags |= ip_vs_conn_secure_tcp_flags(svc); /* * Create a new connection according to the template @@ -714,6 +724,7 @@ ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff *skb, flags = (svc->flags & IP_VS_SVC_F_ONEPACKET && iph->protocol == IPPROTO_UDP) ? IP_VS_CONN_F_ONE_PACKET : 0; + flags |= ip_vs_conn_secure_tcp_flags(svc); /* * Create a connection entry. @@ -779,9 +790,10 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, ip_vs_addr_is_unicast(net, svc->af, &iph->daddr)) { int ret; struct ip_vs_conn *cp; - unsigned int flags = (svc->flags & IP_VS_SVC_F_ONEPACKET && + unsigned int flags = ((svc->flags & IP_VS_SVC_F_ONEPACKET && iph->protocol == IPPROTO_UDP) ? - IP_VS_CONN_F_ONE_PACKET : 0; + IP_VS_CONN_F_ONE_PACKET : 0) | + ip_vs_conn_secure_tcp_flags(svc); union nf_inet_addr daddr = { .all = { 0, 0, 0, 0 } }; /* create a new connection entry */ @@ -1350,7 +1362,9 @@ struct ip_vs_conn *ip_vs_new_conn_out(struct ip_vs_service *svc, /* check if template exists and points to the same dest */ if (!ct || !ip_vs_check_template(ct, dest)) { ct = ip_vs_conn_new(¶m, dest->af, daddr, dport, - IP_VS_CONN_F_TEMPLATE, dest, 0); + IP_VS_CONN_F_TEMPLATE | + ip_vs_conn_secure_tcp_flags(svc), + dest, 0); if (!ct) { kfree(param.pe_data); return NULL; @@ -1364,6 +1378,7 @@ struct ip_vs_conn *ip_vs_new_conn_out(struct ip_vs_service *svc, /* connection flags */ flags = ((svc->flags & IP_VS_SVC_F_ONEPACKET) && iph->protocol == IPPROTO_UDP) ? IP_VS_CONN_F_ONE_PACKET : 0; + flags |= ip_vs_conn_secure_tcp_flags(svc); /* create connection */ ip_vs_conn_fill_param(svc->ipvs, svc->af, iph->protocol, caddr, cport, vaddr, vport, ¶m); diff --git a/net/netfilter/ipvs/ip_vs_ftp.c b/net/netfilter/ipvs/ip_vs_ftp.c index b315c608fda4..73d2e7904303 100644 --- a/net/netfilter/ipvs/ip_vs_ftp.c +++ b/net/netfilter/ipvs/ip_vs_ftp.c @@ -330,7 +330,8 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp, 0, &cp->vaddr, port, &p); n_cp = ip_vs_conn_new(&p, cp->af, &from, port, IP_VS_CONN_F_NO_CPORT | - IP_VS_CONN_F_NFCT, + IP_VS_CONN_F_NFCT | + (cp->flags & IP_VS_CONN_F_SECURE_TCP), cp->dest, skb->mark); if (!n_cp) return 0; @@ -535,8 +536,9 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp, if (!n_cp) { n_cp = ip_vs_conn_new(&p, cp->af, &cp->daddr, htons(ntohs(cp->dport)-1), - IP_VS_CONN_F_NFCT, cp->dest, - skb->mark); + IP_VS_CONN_F_NFCT | + (cp->flags & IP_VS_CONN_F_SECURE_TCP), + cp->dest, skb->mark); if (!n_cp) return 0; -- 2.51.0