Skip to contentSkip to conversation

net/smc: prevent NULL pointer dereference in txopt_get

PATCH Superseded Jeongjun Park 2 participants 10 messages Aug 13, 2024 – Aug 14, 2024

Subsystems (4)

v3 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 net/smc: prevent NULL pointer dereference in txopt_get

Since smc_inet6_prot does not initialize ipv6_pinfo_offset, inet6_create() copies an incorrect address value, sk + 0 (offset), to inet_sk(sk)->pinet6.

In addition, since inet_sk(sk)->pinet6 and smc_sk(sk)->clcsock practically point to the same address, when smc_create_clcsk() stores the newly created clcsock in smc_sk(sk)->clcsock, inet_sk(sk)->pinet6 is corrupted into clcsock. This causes NULL pointer dereference and various other memory corruptions.

To solve this, we need to add a smc6_sock structure for ipv6_pinfo_offset initialization and modify the smc_sock structure.

Reported-by [email protected]
Fixes d25a92ccae6b ("net/smc: Introduce IPPROTO_SMC")
---
 net/smc/smc.h      | 19 ++++++++++---------
 net/smc/smc_inet.c | 24 +++++++++++++++---------
 2 files changed, 25 insertions(+), 18 deletions(-)
net/smc/smc.h +10 -9
index 34b781e463c4..f4d9338b5ed5 100644
@@ -284,15 +284,6 @@ struct smc_connection {
 
 struct smc_sock {				/* smc sock container */
 	struct sock		sk;
-	struct socket		*clcsock;	/* internal tcp socket */
-	void			(*clcsk_state_change)(struct sock *sk);
-						/* original stat_change fct. */
-	void			(*clcsk_data_ready)(struct sock *sk);
-						/* original data_ready fct. */
-	void			(*clcsk_write_space)(struct sock *sk);
-						/* original write_space fct. */
-	void			(*clcsk_error_report)(struct sock *sk);
-						/* original error_report fct. */
 	struct smc_connection	conn;		/* smc connection */
 	struct smc_sock		*listen_smc;	/* listen parent */
 	struct work_struct	connect_work;	/* handle non-blocking connect*/
@@ -325,6 +316,16 @@ struct smc_sock {				/* smc sock container */
 						/* protects clcsock of a listen
 						 * socket
 						 * */
+	struct socket		*clcsock;	/* internal tcp socket */
+	void			(*clcsk_state_change)(struct sock *sk);
+						/* original stat_change fct. */
+	void			(*clcsk_data_ready)(struct sock *sk);
+						/* original data_ready fct. */
+	void			(*clcsk_write_space)(struct sock *sk);
+						/* original write_space fct. */
+	void			(*clcsk_error_report)(struct sock *sk);
+						/* original error_report fct. */
+
 };
 
 #define smc_sk(ptr) container_of_const(ptr, struct smc_sock, sk)
net/smc/smc_inet.c +15 -9
index bece346dd8e9..25f34fd65e8d 100644
@@ -60,16 +60,22 @@ static struct inet_protosw smc_inet_protosw = {
 };
 
 #if IS_ENABLED(CONFIG_IPV6)
+struct smc6_sock {
+	struct smc_sock smc;
+	struct ipv6_pinfo np;
+};
+
 static struct proto smc_inet6_prot = {
-	.name		= "INET6_SMC",
-	.owner		= THIS_MODULE,
-	.init		= smc_inet_init_sock,
-	.hash		= smc_hash_sk,
-	.unhash		= smc_unhash_sk,
-	.release_cb	= smc_release_cb,
-	.obj_size	= sizeof(struct smc_sock),
-	.h.smc_hash	= &smc_v6_hashinfo,
-	.slab_flags	= SLAB_TYPESAFE_BY_RCU,
+	.name				= "INET6_SMC",
+	.owner				= THIS_MODULE,
+	.init				= smc_inet_init_sock,
+	.hash				= smc_hash_sk,
+	.unhash				= smc_unhash_sk,
+	.release_cb			= smc_release_cb,
+	.obj_size			= sizeof(struct smc6_sock),
+	.h.smc_hash			= &smc_v6_hashinfo,
+	.slab_flags			= SLAB_TYPESAFE_BY_RCU,
+	.ipv6_pinfo_offset		= offsetof(struct smc6_sock, np),
 };
 
 static const struct proto_ops smc_inet6_stream_ops = {

--

maintainer
#1 lore raw
Quoted 46 lines · Jeongjun Park

Since smc_inet6_prot does not initialize ipv6_pinfo_offset, inet6_create() copies an incorrect address value, sk + 0 (offset), to inet_sk(sk)->pinet6.

In addition, since inet_sk(sk)->pinet6 and smc_sk(sk)->clcsock practically point to the same address, when smc_create_clcsk() stores the newly created clcsock in smc_sk(sk)->clcsock, inet_sk(sk)->pinet6 is corrupted into clcsock. This causes NULL pointer dereference and various other memory corruptions.

To solve this, we need to add a smc6_sock structure for ipv6_pinfo_offset initialization and modify the smc_sock structure.

Reported-by [email protected]
Fixes d25a92ccae6b ("net/smc: Introduce IPPROTO_SMC")
---
  net/smc/smc.h      | 19 ++++++++++---------
  net/smc/smc_inet.c | 24 +++++++++++++++---------
  2 files changed, 25 insertions(+), 18 deletions(-)
net/smc/smc.h +1 -9
index 34b781e463c4..f4d9338b5ed5 100644
@@ -284,15 +284,6 @@ struct smc_connection {
 
  struct smc_sock {				/* smc sock container */
  	struct sock		sk;
-	struct socket		*clcsock;	/* internal tcp socket */
-	void			(*clcsk_state_change)(struct sock *sk);
-						/* original stat_change fct. */
-	void			(*clcsk_data_ready)(struct sock *sk);
-						/* original data_ready fct. */
-	void			(*clcsk_write_space)(struct sock *sk);
-						/* original write_space fct. */
-	void			(*clcsk_error_report)(struct sock *sk);
-						/* original error_report fct. */
  	struct smc_connection	conn;		/* smc connection */
  	struct smc_sock		*listen_smc;	/* listen parent */
  	struct work_struct	connect_work;	/* handle non-blocking connect*/
@@ -325,6 +316,16 @@ struct smc_sock {				/* smc sock container */
  						/* protects clcsock of a listen
  						 * socket
  						 * */
+	struct socket		*clcsock;	/* internal tcp socket */

net/smc/smc.h struct smc_sock { /* smc sock container */ · line 329

Quoted 10 lines
net/smc/smc.h +9 -0
+	void			(*clcsk_state_change)(struct sock *sk);
+						/* original stat_change fct. */
+	void			(*clcsk_data_ready)(struct sock *sk);
+						/* original data_ready fct. */
+	void			(*clcsk_write_space)(struct sock *sk);
+						/* original write_space fct. */
+	void			(*clcsk_error_report)(struct sock *sk);
+						/* original error_report fct. */
+
  };

Please don't send patches so frequently 🙁.

And it seems like you haven't made any changes? Those modifies still there? Perhaps before you issue the patch, you should carefully check what you have written.

BTW:  Please don't send any new versions of this for at least 24 hours, You need to give yourself and the reviewer some time.

Quoted 39 lines
net/smc/smc.h +0 -0
  #define smc_sk(ptr) container_of_const(ptr, struct smc_sock, sk)
net/smc/smc_inet.c +15 -10
index bece346dd8e9..25f34fd65e8d 100644
@@ -60,16 +60,22 @@ static struct inet_protosw smc_inet_protosw = {
  };
 
  #if IS_ENABLED(CONFIG_IPV6)
+struct smc6_sock {
+	struct smc_sock smc;
+	struct ipv6_pinfo np;
+};
+
  static struct proto smc_inet6_prot = {
-	.name		= "INET6_SMC",
-	.owner		= THIS_MODULE,
-	.init		= smc_inet_init_sock,
-	.hash		= smc_hash_sk,
-	.unhash		= smc_unhash_sk,
-	.release_cb	= smc_release_cb,
-	.obj_size	= sizeof(struct smc_sock),
-	.h.smc_hash	= &smc_v6_hashinfo,
-	.slab_flags	= SLAB_TYPESAFE_BY_RCU,
+	.name				= "INET6_SMC",
+	.owner				= THIS_MODULE,
+	.init				= smc_inet_init_sock,
+	.hash				= smc_hash_sk,
+	.unhash				= smc_unhash_sk,
+	.release_cb			= smc_release_cb,
+	.obj_size			= sizeof(struct smc6_sock),
+	.h.smc_hash			= &smc_v6_hashinfo,
+	.slab_flags			= SLAB_TYPESAFE_BY_RCU,
+	.ipv6_pinfo_offset		= offsetof(struct smc6_sock, np),
  };
 
  static const struct proto_ops smc_inet6_stream_ops = {
--
maintainer
#2 lore raw
In reply to Jeongjun Park
Quoted 63 lines · Jeongjun Park

Since smc_inet6_prot does not initialize ipv6_pinfo_offset, inet6_create() copies an incorrect address value, sk + 0 (offset), to inet_sk(sk)->pinet6.

In addition, since inet_sk(sk)->pinet6 and smc_sk(sk)->clcsock practically point to the same address, when smc_create_clcsk() stores the newly created clcsock in smc_sk(sk)->clcsock, inet_sk(sk)->pinet6 is corrupted into clcsock. This causes NULL pointer dereference and various other memory corruptions.

To solve this, we need to add a smc6_sock structure for ipv6_pinfo_offset initialization and modify the smc_sock structure.

Reported-by [email protected]
Fixes d25a92ccae6b ("net/smc: Introduce IPPROTO_SMC")
---
  net/smc/smc.h      | 19 ++++++++++---------
  net/smc/smc_inet.c | 24 +++++++++++++++---------
  2 files changed, 25 insertions(+), 18 deletions(-)
net/smc/smc.h +10 -9
index 34b781e463c4..f4d9338b5ed5 100644
@@ -284,15 +284,6 @@ struct smc_connection {
 
  struct smc_sock {				/* smc sock container */
  	struct sock		sk;
-	struct socket		*clcsock;	/* internal tcp socket */
-	void			(*clcsk_state_change)(struct sock *sk);
-						/* original stat_change fct. */
-	void			(*clcsk_data_ready)(struct sock *sk);
-						/* original data_ready fct. */
-	void			(*clcsk_write_space)(struct sock *sk);
-						/* original write_space fct. */
-	void			(*clcsk_error_report)(struct sock *sk);
-						/* original error_report fct. */
  	struct smc_connection	conn;		/* smc connection */
  	struct smc_sock		*listen_smc;	/* listen parent */
  	struct work_struct	connect_work;	/* handle non-blocking connect*/
@@ -325,6 +316,16 @@ struct smc_sock {				/* smc sock container */
  						/* protects clcsock of a listen
  						 * socket
  						 * */
+	struct socket		*clcsock;	/* internal tcp socket */
+	void			(*clcsk_state_change)(struct sock *sk);
+						/* original stat_change fct. */
+	void			(*clcsk_data_ready)(struct sock *sk);
+						/* original data_ready fct. */
+	void			(*clcsk_write_space)(struct sock *sk);
+						/* original write_space fct. */
+	void			(*clcsk_error_report)(struct sock *sk);
+						/* original error_report fct. */
+
  };
 
  #define smc_sk(ptr) container_of_const(ptr, struct smc_sock, sk)
net/smc/smc_inet.c +0 -0
index bece346dd8e9..25f34fd65e8d 100644

net/smc/smc_inet.c static struct inet_protosw smc_inet_protosw = { · line 66

Quoted 7 lines
net/smc/smc_inet.c +4 -0
@@ -60,16 +60,22 @@ static struct inet_protosw smc_inet_protosw = {
  };
 
  #if IS_ENABLED(CONFIG_IPV6)
+struct smc6_sock {
+	struct smc_sock smc;
+	struct ipv6_pinfo np;
+};

I prefer to:

struct ipv6_pinfo inet6;

Quoted 25 lines
net/smc/smc_inet.c +11 -10
+
  static struct proto smc_inet6_prot = {
-	.name		= "INET6_SMC",
-	.owner		= THIS_MODULE,
-	.init		= smc_inet_init_sock,
-	.hash		= smc_hash_sk,
-	.unhash		= smc_unhash_sk,
-	.release_cb	= smc_release_cb,
-	.obj_size	= sizeof(struct smc_sock),
-	.h.smc_hash	= &smc_v6_hashinfo,
-	.slab_flags	= SLAB_TYPESAFE_BY_RCU,
+	.name				= "INET6_SMC",
+	.owner				= THIS_MODULE,
+	.init				= smc_inet_init_sock,
+	.hash				= smc_hash_sk,
+	.unhash				= smc_unhash_sk,
+	.release_cb			= smc_release_cb,
+	.obj_size			= sizeof(struct smc6_sock),
+	.h.smc_hash			= &smc_v6_hashinfo,
+	.slab_flags			= SLAB_TYPESAFE_BY_RCU,
+	.ipv6_pinfo_offset		= offsetof(struct smc6_sock, np),
  };
 
  static const struct proto_ops smc_inet6_stream_ops = {
--
#3 lore raw
Quoted 77 lines · D. Wythe
Quoted 63 lines · Jeongjun Park

Since smc_inet6_prot does not initialize ipv6_pinfo_offset, inet6_create() copies an incorrect address value, sk + 0 (offset), to inet_sk(sk)->pinet6.

In addition, since inet_sk(sk)->pinet6 and smc_sk(sk)->clcsock practically point to the same address, when smc_create_clcsk() stores the newly created clcsock in smc_sk(sk)->clcsock, inet_sk(sk)->pinet6 is corrupted into clcsock. This causes NULL pointer dereference and various other memory corruptions.

To solve this, we need to add a smc6_sock structure for ipv6_pinfo_offset initialization and modify the smc_sock structure.

Reported-by [email protected]
Fixes d25a92ccae6b ("net/smc: Introduce IPPROTO_SMC")
---
  net/smc/smc.h      | 19 ++++++++++---------
  net/smc/smc_inet.c | 24 +++++++++++++++---------
  2 files changed, 25 insertions(+), 18 deletions(-)
net/smc/smc.h +10 -9
index 34b781e463c4..f4d9338b5ed5 100644
@@ -284,15 +284,6 @@ struct smc_connection {
 
  struct smc_sock {                           /* smc sock container */
      struct sock             sk;
-     struct socket           *clcsock;       /* internal tcp socket */
-     void                    (*clcsk_state_change)(struct sock *sk);
-                                             /* original stat_change fct. */
-     void                    (*clcsk_data_ready)(struct sock *sk);
-                                             /* original data_ready fct. */
-     void                    (*clcsk_write_space)(struct sock *sk);
-                                             /* original write_space fct. */
-     void                    (*clcsk_error_report)(struct sock *sk);
-                                             /* original error_report fct. */
      struct smc_connection   conn;           /* smc connection */
      struct smc_sock         *listen_smc;    /* listen parent */
      struct work_struct      connect_work;   /* handle non-blocking connect*/
@@ -325,6 +316,16 @@ struct smc_sock {                                /* smc sock container */
                                              /* protects clcsock of a listen
                                               * socket
                                               * */
+     struct socket           *clcsock;       /* internal tcp socket */
+     void                    (*clcsk_state_change)(struct sock *sk);
+                                             /* original stat_change fct. */
+     void                    (*clcsk_data_ready)(struct sock *sk);
+                                             /* original data_ready fct. */
+     void                    (*clcsk_write_space)(struct sock *sk);
+                                             /* original write_space fct. */
+     void                    (*clcsk_error_report)(struct sock *sk);
+                                             /* original error_report fct. */
+
  };
 
  #define smc_sk(ptr) container_of_const(ptr, struct smc_sock, sk)
net/smc/smc_inet.c +0 -0
index bece346dd8e9..25f34fd65e8d 100644

net/smc/smc_inet.c static struct inet_protosw smc_inet_protosw = { · line 66

Quoted 7 lines
net/smc/smc_inet.c +4 -0
@@ -60,16 +60,22 @@ static struct inet_protosw smc_inet_protosw = {
  };
 
  #if IS_ENABLED(CONFIG_IPV6)
+struct smc6_sock {
+     struct smc_sock smc;
+     struct ipv6_pinfo np;
+};

I prefer to:

Quoted 1 line

struct ipv6_pinfo inet6;

Okay, I'll write a v4 patch and send it to you tomorrow.

Regards,
Jeongjun Park

Quoted 27 lines
Quoted 26 lines
net/smc/smc_inet.c +11 -10
+
  static struct proto smc_inet6_prot = {
-     .name           = "INET6_SMC",
-     .owner          = THIS_MODULE,
-     .init           = smc_inet_init_sock,
-     .hash           = smc_hash_sk,
-     .unhash         = smc_unhash_sk,
-     .release_cb     = smc_release_cb,
-     .obj_size       = sizeof(struct smc_sock),
-     .h.smc_hash     = &smc_v6_hashinfo,
-     .slab_flags     = SLAB_TYPESAFE_BY_RCU,
+     .name                           = "INET6_SMC",
+     .owner                          = THIS_MODULE,
+     .init                           = smc_inet_init_sock,
+     .hash                           = smc_hash_sk,
+     .unhash                         = smc_unhash_sk,
+     .release_cb                     = smc_release_cb,
+     .obj_size                       = sizeof(struct smc6_sock),
+     .h.smc_hash                     = &smc_v6_hashinfo,
+     .slab_flags                     = SLAB_TYPESAFE_BY_RCU,
+     .ipv6_pinfo_offset              = offsetof(struct smc6_sock, np),
  };
 
  static const struct proto_ops smc_inet6_stream_ops = {
--
maintainer
#4 lore raw
Quoted 76 lines · Jeongjun Park
Quoted 75 lines · D. Wythe
Quoted 63 lines · Jeongjun Park

Since smc_inet6_prot does not initialize ipv6_pinfo_offset, inet6_create() copies an incorrect address value, sk + 0 (offset), to inet_sk(sk)->pinet6.

In addition, since inet_sk(sk)->pinet6 and smc_sk(sk)->clcsock practically point to the same address, when smc_create_clcsk() stores the newly created clcsock in smc_sk(sk)->clcsock, inet_sk(sk)->pinet6 is corrupted into clcsock. This causes NULL pointer dereference and various other memory corruptions.

To solve this, we need to add a smc6_sock structure for ipv6_pinfo_offset initialization and modify the smc_sock structure.

Reported-by [email protected]
Fixes d25a92ccae6b ("net/smc: Introduce IPPROTO_SMC")
---
   net/smc/smc.h      | 19 ++++++++++---------
   net/smc/smc_inet.c | 24 +++++++++++++++---------
   2 files changed, 25 insertions(+), 18 deletions(-)
net/smc/smc.h +10 -9
index 34b781e463c4..f4d9338b5ed5 100644
@@ -284,15 +284,6 @@ struct smc_connection {
 
   struct smc_sock {                           /* smc sock container */
       struct sock             sk;
-     struct socket           *clcsock;       /* internal tcp socket */
-     void                    (*clcsk_state_change)(struct sock *sk);
-                                             /* original stat_change fct. */
-     void                    (*clcsk_data_ready)(struct sock *sk);
-                                             /* original data_ready fct. */
-     void                    (*clcsk_write_space)(struct sock *sk);
-                                             /* original write_space fct. */
-     void                    (*clcsk_error_report)(struct sock *sk);
-                                             /* original error_report fct. */
       struct smc_connection   conn;           /* smc connection */
       struct smc_sock         *listen_smc;    /* listen parent */
       struct work_struct      connect_work;   /* handle non-blocking connect*/
@@ -325,6 +316,16 @@ struct smc_sock {                                /* smc sock container */
                                               /* protects clcsock of a listen
                                                * socket
                                                * */
+     struct socket           *clcsock;       /* internal tcp socket */
+     void                    (*clcsk_state_change)(struct sock *sk);
+                                             /* original stat_change fct. */
+     void                    (*clcsk_data_ready)(struct sock *sk);
+                                             /* original data_ready fct. */
+     void                    (*clcsk_write_space)(struct sock *sk);
+                                             /* original write_space fct. */
+     void                    (*clcsk_error_report)(struct sock *sk);
+                                             /* original error_report fct. */
+
   };
 
   #define smc_sk(ptr) container_of_const(ptr, struct smc_sock, sk)
net/smc/smc_inet.c +0 -0
index bece346dd8e9..25f34fd65e8d 100644

net/smc/smc_inet.c static struct inet_protosw smc_inet_protosw = { · line 66

Quoted 7 lines
net/smc/smc_inet.c +4 -0
@@ -60,16 +60,22 @@ static struct inet_protosw smc_inet_protosw = {
   };
 
   #if IS_ENABLED(CONFIG_IPV6)
+struct smc6_sock {
+     struct smc_sock smc;
+     struct ipv6_pinfo np;
+};

I prefer to:

Quoted 5 lines
Quoted 1 line

struct ipv6_pinfo inet6;

Okay, I'll write a v4 patch and send it to you tomorrow.

Regards,
Jeongjun Park

Before you issue the v4, I still don't know why you move clcsk_xxx from smc_connection to smc_sock, can you explain it ?

Also, regarding alignment, it's okay for me whether it's aligned or not,But I checked the styles of other types of structures and did not strictly require alignment, so I now feel that there is no need to modify so much to do alignment.

D. Wythe

Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
net/smc/smc_inet.c +11 -10
+
   static struct proto smc_inet6_prot = {
-     .name           = "INET6_SMC",
-     .owner          = THIS_MODULE,
-     .init           = smc_inet_init_sock,
-     .hash           = smc_hash_sk,
-     .unhash         = smc_unhash_sk,
-     .release_cb     = smc_release_cb,
-     .obj_size       = sizeof(struct smc_sock),
-     .h.smc_hash     = &smc_v6_hashinfo,
-     .slab_flags     = SLAB_TYPESAFE_BY_RCU,
+     .name                           = "INET6_SMC",
+     .owner                          = THIS_MODULE,
+     .init                           = smc_inet_init_sock,
+     .hash                           = smc_hash_sk,
+     .unhash                         = smc_unhash_sk,
+     .release_cb                     = smc_release_cb,
+     .obj_size                       = sizeof(struct smc6_sock),
+     .h.smc_hash                     = &smc_v6_hashinfo,
+     .slab_flags                     = SLAB_TYPESAFE_BY_RCU,
+     .ipv6_pinfo_offset              = offsetof(struct smc6_sock, np),
   };
 
   static const struct proto_ops smc_inet6_stream_ops = {
--
maintainer
#5 lore raw
Quoted 90 lines · D. Wythe
Quoted 87 lines · Jeongjun Park
Quoted 86 lines · D. Wythe
Quoted 74 lines · Jeongjun Park

Since smc_inet6_prot does not initialize ipv6_pinfo_offset, inet6_create() copies an incorrect address value, sk + 0 (offset), to inet_sk(sk)->pinet6.

In addition, since inet_sk(sk)->pinet6 and smc_sk(sk)->clcsock practically point to the same address, when smc_create_clcsk() stores the newly created clcsock in smc_sk(sk)->clcsock, inet_sk(sk)->pinet6 is corrupted into clcsock. This causes NULL pointer dereference and various other memory corruptions.

To solve this, we need to add a smc6_sock structure for ipv6_pinfo_offset initialization and modify the smc_sock structure.

Reported-by [email protected]
Fixes d25a92ccae6b ("net/smc: Introduce IPPROTO_SMC")

---
   net/smc/smc.h      | 19 ++++++++++--------- net/smc/smc_inet.c | 24 +++++++++++++++---------

   2 files changed, 25 insertions(+), 18 deletions(-)
net/smc/smc.h +0 -0
index 34b781e463c4..f4d9338b5ed5 100644
@@ -284,15 +284,6 @@ struct smc_connection {
 

   struct smc_sock {                           /* smc sock container */ struct sock             sk;
-     struct socket           *clcsock;       /* internal tcp socket */
-     void                    (*clcsk_state_change)(struct sock *sk); -                                             /* original stat_change fct. */
-     void                    (*clcsk_data_ready)(struct sock *sk); -                                             /* original data_ready fct. */
-     void                    (*clcsk_write_space)(struct sock *sk); -                                             /* original write_space fct. */
-     void                    (*clcsk_error_report)(struct sock *sk); -                                             /* original error_report fct. */
       struct smc_connection   conn;           /* smc connection */ struct smc_sock         *listen_smc;    /* listen parent */ struct work_struct      connect_work;   /* handle non-blocking connect*/

net/smc/smc.h +0 -0
@@ -325,6 +316,16 @@ struct smc_sock 

{                                /* smc sock container */
                                               /* protects clcsock of a listen
                                                * socket
                                                * */
+     struct socket           *clcsock;       /* internal tcp socket */
+     void                    (*clcsk_state_change)(struct sock *sk); +                                             /* original stat_change fct. */
+     void                    (*clcsk_data_ready)(struct sock *sk); +                                             /* original data_ready fct. */
+     void                    (*clcsk_write_space)(struct sock *sk); +                                             /* original write_space fct. */
+     void                    (*clcsk_error_report)(struct sock *sk); +                                             /* original error_report fct. */
+
   };

   #define smc_sk(ptr) container_of_const(ptr, struct smc_sock, sk)

net/smc/smc_inet.c +0 -0
index bece346dd8e9..25f34fd65e8d 100644

net/smc/smc_inet.c static struct inet_protosw smc_inet_protosw = { · line 66

Quoted 7 lines
net/smc/smc_inet.c +4 -0
@@ -60,16 +60,22 @@ static struct inet_protosw smc_inet_protosw = {
    };
 
    #if IS_ENABLED(CONFIG_IPV6)
+struct smc6_sock {
+     struct smc_sock smc;
+     struct ipv6_pinfo np;
+};

I prefer to:

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

struct ipv6_pinfo inet6;

Okay, I'll write a v4 patch and send it to you tomorrow.

Regards,
Jeongjun Park

Before you issue the v4, I still don't know why you move clcsk_xxx from smc_connection to smc_sock, can you explain it ?

I misread it, it seems you're moving them from head to tail, but still, the same question, why move it ?

Thanks
D. Wythe

Quoted 38 lines

Also, regarding alignment, it's okay for me whether it's aligned or not,But I checked the styles of other types of structures and did not strictly require alignment, so I now feel that there is no need to modify so much to do alignment.

D. Wythe

Quoted 27 lines
Quoted 27 lines
Quoted 27 lines
net/smc/smc_inet.c +11 -9
+
    static struct proto smc_inet6_prot = {
-     .name           = "INET6_SMC",
-     .owner          = THIS_MODULE,
-     .init           = smc_inet_init_sock,
-     .hash           = smc_hash_sk,
-     .unhash         = smc_unhash_sk,
-     .release_cb     = smc_release_cb,
-     .obj_size       = sizeof(struct smc_sock),
-     .h.smc_hash     = &smc_v6_hashinfo,
-     .slab_flags     = SLAB_TYPESAFE_BY_RCU,
+     .name                           = "INET6_SMC",
+     .owner                          = THIS_MODULE,
+     .init                           = smc_inet_init_sock,
+     .hash                           = smc_hash_sk,
+     .unhash                         = smc_unhash_sk,
+     .release_cb                     = smc_release_cb,
+     .obj_size                       = sizeof(struct smc6_sock),
+     .h.smc_hash                     = &smc_v6_hashinfo,
+     .slab_flags                     = SLAB_TYPESAFE_BY_RCU,
+     .ipv6_pinfo_offset              = offsetof(struct smc6_sock, 
 np),
    };
 

   static const struct proto_ops smc_inet6_stream_ops = {

#6 lore raw

Because clcsk_*, like clcsock, is initialized during the smc init process, the code was moved to prevent clcsk_* from having an address like inet_sk(sk)->pinet6, thereby preventing the previously initialized values ​​from being tampered with.

Additionally, if you don't need alignment in smc_inet6_prot , I'll modify the patch to only add the necessary code without alignment.

Regards,
Jeongjun Park

Quoted 43 lines
Quoted 42 lines

Also, regarding alignment, it's okay for me whether it's aligned or not,But I checked the styles of other types of
structures and did not strictly require alignment, so I now feel that there is no need to
modify so much to do alignment.

D. Wythe

Quoted 27 lines
Quoted 27 lines
Quoted 27 lines

+
   static struct proto smc_inet6_prot = {
-     .name           = "INET6_SMC",
-     .owner          = THIS_MODULE,
-     .init           = smc_inet_init_sock,
-     .hash           = smc_hash_sk,
-     .unhash         = smc_unhash_sk,
-     .release_cb     = smc_release_cb,
-     .obj_size       = sizeof(struct smc_sock),
-     .h.smc_hash     = &smc_v6_hashinfo,
-     .slab_flags     = SLAB_TYPESAFE_BY_RCU,
+     .name                           = "INET6_SMC",
+     .owner                          = THIS_MODULE,
+     .init                           = smc_inet_init_sock,
+     .hash                           = smc_hash_sk,
+     .unhash                         = smc_unhash_sk,
+     .release_cb                     = smc_release_cb,
+     .obj_size                       = sizeof(struct smc6_sock),
+     .h.smc_hash                     = &smc_v6_hashinfo,
+     .slab_flags                     = SLAB_TYPESAFE_BY_RCU,
+     .ipv6_pinfo_offset              = offsetof(struct smc6_sock, np),
   };

   static const struct proto_ops smc_inet6_stream_ops = { --

maintainer
#7 lore raw
Quoted 4 lines · Jeongjun Park

Because clcsk_*, like clcsock, is initialized during the smc init process, the code was moved to prevent clcsk_* from having an address like inet_sk(sk)->pinet6, thereby preventing the previously initialized values ​​from being tampered with.

I don't agree with your approach, but I finally got the problem you described. In fact, the issue here is that smc_sock should also be an inet_sock, whereas currently it's just a sock. Therefore, the best solution would be to embed an inet_sock within smc_sock rather than performing this movement as you suggested.

struct smc_sock {               /* smc sock container */ union {
        struct sock         sk;
        struct inet_sock    inet;
    };

    ...

Thanks.
D. Wythe

Quoted 44 lines

Additionally, if you don't need alignment in smc_inet6_prot , I'll modify the patch to only add the necessary code without alignment.

Regards,
Jeongjun Park

Quoted 36 lines
Quoted 36 lines

Also, regarding alignment, it's okay for me whether it's aligned or not,But I checked the styles of other types of
structures and did not strictly require alignment, so I now feel that there is no need to
modify so much to do alignment.

D. Wythe

Quoted 26 lines
Quoted 26 lines
Quoted 26 lines

+
   static struct proto smc_inet6_prot = {
-     .name           = "INET6_SMC",
-     .owner          = THIS_MODULE,
-     .init           = smc_inet_init_sock,
-     .hash           = smc_hash_sk,
-     .unhash         = smc_unhash_sk,
-     .release_cb     = smc_release_cb,
-     .obj_size       = sizeof(struct smc_sock),
-     .h.smc_hash     = &smc_v6_hashinfo,
-     .slab_flags     = SLAB_TYPESAFE_BY_RCU,
+     .name                           = "INET6_SMC",
+     .owner                          = THIS_MODULE,
+     .init                           = smc_inet_init_sock,
+     .hash                           = smc_hash_sk,
+     .unhash                         = smc_unhash_sk,
+     .release_cb                     = smc_release_cb,
+     .obj_size                       = sizeof(struct smc6_sock),
+     .h.smc_hash                     = &smc_v6_hashinfo,
+     .slab_flags                     = SLAB_TYPESAFE_BY_RCU,
+     .ipv6_pinfo_offset              = offsetof(struct smc6_sock, np),
   };

   static const struct proto_ops smc_inet6_stream_ops = {
--

#8 lore raw
Quoted 22 lines

D. Wythe wrote:



Quoted 5 lines · Jeongjun Park

Because clcsk_*, like clcsock, is initialized during the smc init process, the code was moved to prevent clcsk_* from having an address like inet_sk(sk)->pinet6, thereby preventing the previously initialized values ​​from being tampered with.

I don't agree with your approach, but I finally got the problem you described. In fact, the issue here is that smc_sock should also be an inet_sock, whereas currently it's just a sock. Therefore, the best solution would be to embed an inet_sock within smc_sock rather than performing this movement as you suggested.

struct smc_sock { /* smc sock container */

    union {
        struct sock         sk;
        struct inet_sock    inet;
    };

    ...
Quoted 3 lines

Thanks.
D. Wythe

Wow, I didn't know this could be done this way. I'll test it with that code and get back to you

Regards,
Jeongjun Park

Quoted 46 lines
Quoted 45 lines

Additionally, if you don't need alignment in smc_inet6_prot , I'll modify the patch to only add the necessary code without alignment.

Regards,
Jeongjun Park

Quoted 36 lines
Quoted 36 lines

Also, regarding alignment, it's okay for me whether it's aligned or not,But I checked the styles of other types of
structures and did not strictly require alignment, so I now feel that there is no need to
modify so much to do alignment.

D. Wythe

Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
(quoted diff) +11 -9
+
   static struct proto smc_inet6_prot = {
-     .name           = "INET6_SMC",
-     .owner          = THIS_MODULE,
-     .init           = smc_inet_init_sock,
-     .hash           = smc_hash_sk,
-     .unhash         = smc_unhash_sk,
-     .release_cb     = smc_release_cb,
-     .obj_size       = sizeof(struct smc_sock),
-     .h.smc_hash     = &smc_v6_hashinfo,
-     .slab_flags     = SLAB_TYPESAFE_BY_RCU,
+     .name                           = "INET6_SMC",
+     .owner                          = THIS_MODULE,
+     .init                           = smc_inet_init_sock,
+     .hash                           = smc_hash_sk,
+     .unhash                         = smc_unhash_sk,
+     .release_cb                     = smc_release_cb,
+     .obj_size                       = sizeof(struct smc6_sock),
+     .h.smc_hash                     = &smc_v6_hashinfo,
+     .slab_flags                     = SLAB_TYPESAFE_BY_RCU,
+     .ipv6_pinfo_offset              = offsetof(struct smc6_sock,

np),
};

   static const struct proto_ops smc_inet6_stream_ops = {

--

#9 lore raw
In reply to D. Wythe

2024년 8월 14일 (수) 오후 3:00, D. Wythe <[email protected]>님이 작성:

Quoted 23 lines · Jeongjun Park
Quoted 4 lines

Because clcsk_*, like clcsock, is initialized during the smc init process, the code was moved to prevent clcsk_* from having an address like inet_sk(sk)->pinet6, thereby preventing the previously initialized values from being tampered with.

I don't agree with your approach, but I finally got the problem you described. In fact, the issue here is that smc_sock should also be an inet_sock, whereas currently it's just a sock. Therefore, the best solution would be to embed an inet_sock within smc_sock rather than performing this movement as you suggested.

struct smc_sock { /* smc sock container */

     union {
         struct sock         sk;
         struct inet_sock    inet;
     };

     ...
Quoted 3 lines

Thanks.
D. Wythe

I tested it myself and it doesn't trigger the existing issue, so I'll write a v4 patch with this code and send it to you.

Regards,
Jeongjun Park

Quoted 46 lines
Quoted 45 lines

Additionally, if you don't need alignment in smc_inet6_prot , I'll modify the patch to only add the necessary code without alignment.

Regards,
Jeongjun Park

Quoted 36 lines
Quoted 36 lines

Also, regarding alignment, it's okay for me whether it's aligned or not,But I checked the styles of other types of
structures and did not strictly require alignment, so I now feel that there is no need to
modify so much to do alignment.

D. Wythe

Quoted 26 lines
Quoted 26 lines
Quoted 26 lines
(quoted diff) +11 -9
+
    static struct proto smc_inet6_prot = {
-     .name           = "INET6_SMC",
-     .owner          = THIS_MODULE,
-     .init           = smc_inet_init_sock,
-     .hash           = smc_hash_sk,
-     .unhash         = smc_unhash_sk,
-     .release_cb     = smc_release_cb,
-     .obj_size       = sizeof(struct smc_sock),
-     .h.smc_hash     = &smc_v6_hashinfo,
-     .slab_flags     = SLAB_TYPESAFE_BY_RCU,
+     .name                           = "INET6_SMC",
+     .owner                          = THIS_MODULE,
+     .init                           = smc_inet_init_sock,
+     .hash                           = smc_hash_sk,
+     .unhash                         = smc_unhash_sk,
+     .release_cb                     = smc_release_cb,
+     .obj_size                       = sizeof(struct smc6_sock),
+     .h.smc_hash                     = &smc_v6_hashinfo,
+     .slab_flags                     = SLAB_TYPESAFE_BY_RCU,
+     .ipv6_pinfo_offset              = offsetof(struct smc6_sock,

np),

    };

    static const struct proto_ops smc_inet6_stream_ops = {

--