Netdev List
 help / color / mirror / Atom feed
* [PATCH] sctp: fix skb_over_panic when adding addresses with a pending delete of another family
@ 2026-11-06 18:52 Henry Martin
  2026-11-10 15:47 ` Xin Long
  0 siblings, 1 reply; 5+ messages in thread
From: Henry Martin @ 2026-11-06 18:52 UTC (permalink / raw)
  To: lucien.xin, marcelo.leitner, davem, kuba, pabeni, horms, edumazet
  Cc: linux-sctp, netdev, Henry Martin, stable

sctp_make_asconf_update_ip() accounts for a pending DEL_IP
parameter by reusing the length of the address being added. The
write-back side instead serializes the pending address itself,
with its own address family. If the pending delete is IPv6
(20-byte parameter) while the added addresses are IPv4 (8-byte),
the chunk is allocated 12 bytes short and sctp_addto_chunk()
writes past the end of the skb. E.g. on mainline (05441d697f7f):

    skbuff: skb_over_panic: text:ffffffff84859c77 len:392 put:20
        tail:0x188 end:0x180 dev:<NULL>
    kernel BUG at net/core/skbuff.c:215!
    CPU: 0 UID: 1000 PID: 379 Comm: poc_sctp
    Call Trace:
     skb_panic
     skb_put
     sctp_addto_chunk
     sctp_make_asconf_update_ip
     sctp_send_asconf_add_ip
     sctp_setsockopt_bindx
     __x64_sys_setsockopt

Requires addip enabled on the endpoint (net.sctp.addip_enable=1).

Account for the pending delete with its own address family, as
the write-back side already does.

This issue was discovered by Tencent CodeBuddy Security.

Cc: stable@vger.kernel.org
Fixes: 8a07eb0a50ae ("sctp: Add ASCONF operation on the single-homed host")
Signed-off-by: Henry Martin <bsdhenrymartin@gmail.com>
---
 net/sctp/sm_make_chunk.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 90de272842512..18947ec5ff9f9 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -2886,9 +2886,17 @@ struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *asoc,
 
 		addr_buf += af->sockaddr_len;
 		if (asoc->asconf_addr_del_pending && !del_pickup) {
-			/* reuse the parameter length from the same scope one */
+			/* The DEL_IP parameter is serialized from the
+			 * pending address itself below; account for its
+			 * own address family, which may differ from the
+			 * added one.
+			 */
+			addr = asoc->asconf_addr_del_pending;
+			af = sctp_get_af_specific(addr->v4.sin_family);
+
 			totallen += paramlen;
-			totallen += addr_param_len;
+			totallen += af->to_addr_param(addr, &addr_param);
+
 			del_pickup = 1;
 
 			pr_debug("%s: picked same-scope del_pending addr, "
-- 
2.43.7


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] sctp: fix skb_over_panic when adding addresses with a pending delete of another family
  2026-11-06 18:52 [PATCH] sctp: fix skb_over_panic when adding addresses with a pending delete of another family Henry Martin
@ 2026-11-10 15:47 ` Xin Long
  2026-11-11  8:23   ` [PATCH v2] " Henry Martin
  0 siblings, 1 reply; 5+ messages in thread
From: Xin Long @ 2026-11-10 15:47 UTC (permalink / raw)
  To: Henry Martin
  Cc: marcelo.leitner, davem, kuba, pabeni, horms, edumazet, linux-sctp,
	netdev, stable

On Fri, Nov 6, 2026 at 1:52 PM Henry Martin <bsdhenrymartin@gmail.com> wrote:
>
> sctp_make_asconf_update_ip() accounts for a pending DEL_IP
> parameter by reusing the length of the address being added. The
> write-back side instead serializes the pending address itself,
> with its own address family. If the pending delete is IPv6
> (20-byte parameter) while the added addresses are IPv4 (8-byte),
> the chunk is allocated 12 bytes short and sctp_addto_chunk()
> writes past the end of the skb. E.g. on mainline (05441d697f7f):
>
>     skbuff: skb_over_panic: text:ffffffff84859c77 len:392 put:20
>         tail:0x188 end:0x180 dev:<NULL>
>     kernel BUG at net/core/skbuff.c:215!
>     CPU: 0 UID: 1000 PID: 379 Comm: poc_sctp
>     Call Trace:
>      skb_panic
>      skb_put
>      sctp_addto_chunk
>      sctp_make_asconf_update_ip
>      sctp_send_asconf_add_ip
>      sctp_setsockopt_bindx
>      __x64_sys_setsockopt
>
> Requires addip enabled on the endpoint (net.sctp.addip_enable=1).
>
> Account for the pending delete with its own address family, as
> the write-back side already does.
>
> This issue was discovered by Tencent CodeBuddy Security.
>
> Cc: stable@vger.kernel.org
> Fixes: 8a07eb0a50ae ("sctp: Add ASCONF operation on the single-homed host")
> Signed-off-by: Henry Martin <bsdhenrymartin@gmail.com>
> ---
>  net/sctp/sm_make_chunk.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
> index 90de272842512..18947ec5ff9f9 100644
> --- a/net/sctp/sm_make_chunk.c
> +++ b/net/sctp/sm_make_chunk.c
> @@ -2886,9 +2886,17 @@ struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *asoc,
>
>                 addr_buf += af->sockaddr_len;
>                 if (asoc->asconf_addr_del_pending && !del_pickup) {
> -                       /* reuse the parameter length from the same scope one */
> +                       /* The DEL_IP parameter is serialized from the
> +                        * pending address itself below; account for its
> +                        * own address family, which may differ from the
> +                        * added one.
> +                        */
> +                       addr = asoc->asconf_addr_del_pending;
> +                       af = sctp_get_af_specific(addr->v4.sin_family);
> +
>                         totallen += paramlen;
> -                       totallen += addr_param_len;
> +                       totallen += af->to_addr_param(addr, &addr_param);
> +
>                         del_pickup = 1;
>
>                         pr_debug("%s: picked same-scope del_pending addr, "
> --
> 2.43.7
>
I think with no longer using addr_param_len, you can move the
if (asoc->asconf_addr_del_pending) branch out of this loop.

Thanks.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH v2] sctp: fix skb_over_panic when adding addresses with a pending delete of another family
  2026-11-10 15:47 ` Xin Long
@ 2026-11-11  8:23   ` Henry Martin
  2026-11-16 14:14     ` Xin Long
  2026-11-16 23:10     ` patchwork-bot+netdevbpf
  0 siblings, 2 replies; 5+ messages in thread
From: Henry Martin @ 2026-11-11  8:23 UTC (permalink / raw)
  To: lucien.xin, marcelo.leitner, davem, kuba, pabeni, horms, edumazet
  Cc: linux-sctp, netdev, Henry Martin, stable

sctp_make_asconf_update_ip() accounts for a pending DEL_IP
parameter by reusing the length of the address being added. The
write-back side instead serializes the pending address itself,
with its own address family. If the pending delete is IPv6
(20-byte parameter) while the added addresses are IPv4 (8-byte),
the chunk is allocated 12 bytes short and sctp_addto_chunk()
writes past the end of the skb. E.g. on mainline (05441d697f7f):

    skbuff: skb_over_panic: text:ffffffff84859c77 len:392 put:20
        tail:0x188 end:0x180 dev:<NULL>
    kernel BUG at net/core/skbuff.c:215!
    CPU: 0 UID: 1000 PID: 379 Comm: poc_sctp
    Call Trace:
     skb_panic
     skb_put
     sctp_addto_chunk
     sctp_make_asconf_update_ip
     sctp_send_asconf_add_ip
     sctp_setsockopt_bindx
     __x64_sys_setsockopt

Requires addip enabled on the endpoint (net.sctp.addip_enable=1).

Account for the pending delete with its own address family, as the
write-back side already does.

This issue was discovered by Tencent CodeBuddy Security.

Cc: stable@vger.kernel.org
Fixes: 8a07eb0a50ae ("sctp: Add ASCONF operation on the single-homed host")
Signed-off-by: Henry Martin <bsdhenrymartin@gmail.com>
---
v2: move the pending-delete accounting out of the length loop and
    drop the del_pickup flag, which no longer guards anything.

 net/sctp/sm_make_chunk.c | 16 ++++++++++------
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index 90de272842512..b8e4db81636e2 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -2870,7 +2870,6 @@ struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *asoc,
 	int addr_param_len = 0;
 	union sctp_addr *addr;
 	int totallen = 0, i;
-	int del_pickup = 0;
 	struct sctp_af *af;
 	void *addr_buf;
 
@@ -2885,16 +2884,21 @@ struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *asoc,
 		totallen += addr_param_len;
 
 		addr_buf += af->sockaddr_len;
-		if (asoc->asconf_addr_del_pending && !del_pickup) {
-			/* reuse the parameter length from the same scope one */
-			totallen += paramlen;
-			totallen += addr_param_len;
-			del_pickup = 1;
-
-			pr_debug("%s: picked same-scope del_pending addr, "
-				 "totallen for all addresses is %d\n",
-				 __func__, totallen);
-		}
+	}
+
+	if (asoc->asconf_addr_del_pending) {
+		/* The DEL_IP parameter is serialized from the pending address
+		 * itself below; account for its own address family, which may
+		 * differ from the added ones.
+		 */
+		addr = asoc->asconf_addr_del_pending;
+		af = sctp_get_af_specific(addr->v4.sin_family);
+		totallen += paramlen;
+		totallen += af->to_addr_param(addr, &addr_param);
+
+		pr_debug("%s: picked del_pending addr, "
+			 "totallen for all addresses is %d\n",
+			 __func__, totallen);
 	}
 
 	/* Create an asconf chunk with the required length. */
@@ -2917,7 +2921,7 @@ struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *asoc,
 
 		addr_buf += af->sockaddr_len;
 	}
-	if (flags == SCTP_PARAM_ADD_IP && del_pickup) {
+	if (flags == SCTP_PARAM_ADD_IP && asoc->asconf_addr_del_pending) {
 		addr = asoc->asconf_addr_del_pending;
 		af = sctp_get_af_specific(addr->v4.sin_family);
 		addr_param_len = af->to_addr_param(addr, &addr_param);

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH v2] sctp: fix skb_over_panic when adding addresses with a pending delete of another family
  2026-11-11  8:23   ` [PATCH v2] " Henry Martin
@ 2026-11-16 14:14     ` Xin Long
  2026-11-16 23:10     ` patchwork-bot+netdevbpf
  1 sibling, 0 replies; 5+ messages in thread
From: Xin Long @ 2026-11-16 14:14 UTC (permalink / raw)
  To: Henry Martin
  Cc: marcelo.leitner, davem, kuba, pabeni, horms, edumazet, linux-sctp,
	netdev, stable

On Wed, Nov 11, 2026 at 3:23 AM Henry Martin <bsdhenrymartin@gmail.com> wrote:
>
> sctp_make_asconf_update_ip() accounts for a pending DEL_IP
> parameter by reusing the length of the address being added. The
> write-back side instead serializes the pending address itself,
> with its own address family. If the pending delete is IPv6
> (20-byte parameter) while the added addresses are IPv4 (8-byte),
> the chunk is allocated 12 bytes short and sctp_addto_chunk()
> writes past the end of the skb. E.g. on mainline (05441d697f7f):
>
>     skbuff: skb_over_panic: text:ffffffff84859c77 len:392 put:20
>         tail:0x188 end:0x180 dev:<NULL>
>     kernel BUG at net/core/skbuff.c:215!
>     CPU: 0 UID: 1000 PID: 379 Comm: poc_sctp
>     Call Trace:
>      skb_panic
>      skb_put
>      sctp_addto_chunk
>      sctp_make_asconf_update_ip
>      sctp_send_asconf_add_ip
>      sctp_setsockopt_bindx
>      __x64_sys_setsockopt
>
> Requires addip enabled on the endpoint (net.sctp.addip_enable=1).
>
> Account for the pending delete with its own address family, as the
> write-back side already does.
>
> This issue was discovered by Tencent CodeBuddy Security.
>
> Cc: stable@vger.kernel.org
> Fixes: 8a07eb0a50ae ("sctp: Add ASCONF operation on the single-homed host")
> Signed-off-by: Henry Martin <bsdhenrymartin@gmail.com>
> ---
> v2: move the pending-delete accounting out of the length loop and
>     drop the del_pickup flag, which no longer guards anything.
>
>  net/sctp/sm_make_chunk.c | 16 ++++++++++------
>  1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
> index 90de272842512..b8e4db81636e2 100644
> --- a/net/sctp/sm_make_chunk.c
> +++ b/net/sctp/sm_make_chunk.c
> @@ -2870,7 +2870,6 @@ struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *asoc,
>         int addr_param_len = 0;
>         union sctp_addr *addr;
>         int totallen = 0, i;
> -       int del_pickup = 0;
>         struct sctp_af *af;
>         void *addr_buf;
>
> @@ -2885,16 +2884,21 @@ struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *asoc,
>                 totallen += addr_param_len;
>
>                 addr_buf += af->sockaddr_len;
> -               if (asoc->asconf_addr_del_pending && !del_pickup) {
> -                       /* reuse the parameter length from the same scope one */
> -                       totallen += paramlen;
> -                       totallen += addr_param_len;
> -                       del_pickup = 1;
> -
> -                       pr_debug("%s: picked same-scope del_pending addr, "
> -                                "totallen for all addresses is %d\n",
> -                                __func__, totallen);
> -               }
> +       }
> +
> +       if (asoc->asconf_addr_del_pending) {
> +               /* The DEL_IP parameter is serialized from the pending address
> +                * itself below; account for its own address family, which may
> +                * differ from the added ones.
> +                */
> +               addr = asoc->asconf_addr_del_pending;
> +               af = sctp_get_af_specific(addr->v4.sin_family);
> +               totallen += paramlen;
> +               totallen += af->to_addr_param(addr, &addr_param);
> +
> +               pr_debug("%s: picked del_pending addr, "
> +                        "totallen for all addresses is %d\n",
> +                        __func__, totallen);
>         }
>
>         /* Create an asconf chunk with the required length. */
> @@ -2917,7 +2921,7 @@ struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *asoc,
>
>                 addr_buf += af->sockaddr_len;
>         }
> -       if (flags == SCTP_PARAM_ADD_IP && del_pickup) {
> +       if (flags == SCTP_PARAM_ADD_IP && asoc->asconf_addr_del_pending) {
>                 addr = asoc->asconf_addr_del_pending;
>                 af = sctp_get_af_specific(addr->v4.sin_family);
>                 addr_param_len = af->to_addr_param(addr, &addr_param);

Acked-by: Xin Long <lucien.xin@gmail.com>

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v2] sctp: fix skb_over_panic when adding addresses with a pending delete of another family
  2026-11-11  8:23   ` [PATCH v2] " Henry Martin
  2026-11-16 14:14     ` Xin Long
@ 2026-11-16 23:10     ` patchwork-bot+netdevbpf
  1 sibling, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2026-11-16 23:10 UTC (permalink / raw)
  To: Henry Martin
  Cc: lucien.xin, marcelo.leitner, davem, kuba, pabeni, horms, edumazet,
	linux-sctp, netdev, stable

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Wed, 11 Nov 2026 16:23:13 +0800 you wrote:
> sctp_make_asconf_update_ip() accounts for a pending DEL_IP
> parameter by reusing the length of the address being added. The
> write-back side instead serializes the pending address itself,
> with its own address family. If the pending delete is IPv6
> (20-byte parameter) while the added addresses are IPv4 (8-byte),
> the chunk is allocated 12 bytes short and sctp_addto_chunk()
> writes past the end of the skb. E.g. on mainline (05441d697f7f):
> 
> [...]

Here is the summary with links:
  - [v2] sctp: fix skb_over_panic when adding addresses with a pending delete of another family
    https://git.kernel.org/netdev/net/c/ce09d8c13a15

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2026-11-16 23:10 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-06 18:52 [PATCH] sctp: fix skb_over_panic when adding addresses with a pending delete of another family Henry Martin
2026-11-10 15:47 ` Xin Long
2026-11-11  8:23   ` [PATCH v2] " Henry Martin
2026-11-16 14:14     ` Xin Long
2026-11-16 23:10     ` patchwork-bot+netdevbpf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox