net: diag: add workaround for inode truncation
Subsystems (2)
Jakub Kicinski
maintainerPATCH 1/1 net: diag: add workaround for inode truncation
Dave reports that struct inet_diag_msg::idiag_inode is 32 bit, while inode's type is unsigned long. This leads to truncation.
Since there is nothing we can do about the size of existing fields - add a new attribute to carry 64 bit inode numbers.
--- include/linux/inet_diag.h | 1 + include/uapi/linux/inet_diag.h | 1 + net/ipv4/inet_diag.c | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-)
include/linux/inet_diag.h +1 -0
@@ -75,6 +75,7 @@ static inline size_t inet_diag_msg_attrs_size(void)#ifdef CONFIG_SOCK_CGROUP_DATA + nla_total_size_64bit(sizeof(u64)) /* INET_DIAG_CGROUP_ID */#endif + +nla_total_size_64bit (sizeof (u64))/* INET_DIAG_INODE */ ; } int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb,
include/uapi/linux/inet_diag.h +1 -0
@@ -160,6 +160,7 @@ enum {INET_DIAG_ULP_INFO ,INET_DIAG_SK_BPF_STORAGES ,INET_DIAG_CGROUP_ID , +INET_DIAG_INODE , __INET_DIAG_MAX, };
net/ipv4/inet_diag.c +6 -1
@@ -125,6 +125,7 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb, bool net_admin) {const struct inet_sock *inet =inet_sk (sk); +unsigned long ino;if (nla_put_u8 (skb,INET_DIAG_SHUTDOWN , sk->sk_shutdown)) goto errout;
@@ -177,8 +178,12 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb, goto errout;#endif + ino =sock_i_ino (sk); +if (nla_put_u64_64bit (skb,INET_DIAG_INODE , ino,INET_DIAG_PAD )) + goto errout; + r->idiag_uid =from_kuid_munged (user_ns,sock_i_uid (sk)); - r->idiag_inode =sock_i_ino (sk); + r->idiag_inode = ino;return 0 ; errout:
Signature · 1 line
2.26.2
Quoted 55 lines · Jakub Kicinski
Dave reports that struct
inet_diag_msg::idiag_inodeis 32 bit, while inode's type is unsigned long. This leads to truncation.Since there is nothing we can do about the size of existing fields - add a new attribute to carry 64 bit inode numbers.
Reported-by Dave Marchevsky <[email protected]>Signed-off-by Jakub Kicinski <[email protected]>--- include/linux/inet_diag.h | 1 + include/uapi/linux/inet_diag.h | 1 + net/ipv4/inet_diag.c | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-)include/linux/inet_diag.h +1
-0@@ -75,6 +75,7 @@ static inline size_t inet_diag_msg_attrs_size(void)#ifdef CONFIG_SOCK_CGROUP_DATA + nla_total_size_64bit(sizeof(u64)) /* INET_DIAG_CGROUP_ID */#endif + +nla_total_size_64bit (sizeof (u64))/* INET_DIAG_INODE */ ; } int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb,include/uapi/linux/inet_diag.h +1
-0@@ -160,6 +160,7 @@ enum {INET_DIAG_ULP_INFO ,INET_DIAG_SK_BPF_STORAGES ,INET_DIAG_CGROUP_ID , +INET_DIAG_INODE , __INET_DIAG_MAX, };net/ipv4/inet_diag.c +1
-0@@ -125,6 +125,7 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb, bool net_admin) {const struct inet_sock *inet =inet_sk (sk); +unsigned long ino;if (nla_put_u8 (skb,INET_DIAG_SHUTDOWN , sk->sk_shutdown)) goto errout;@@ -177,8 +178,12 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb, goto errout;#endif
net/ipv4/inet_diag.c int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb, · line 189
Quoted 10 lines
net/ipv4/inet_diag.c +5
-1+ ino =sock_i_ino (sk); +if (nla_put_u64_64bit (skb,INET_DIAG_INODE , ino,INET_DIAG_PAD )) + goto errout; + r->idiag_uid =from_kuid_munged (user_ns,sock_i_uid (sk)); - r->idiag_inode =sock_i_ino (sk); + r->idiag_inode = ino;return 0 ; errout:
Last time I checked socket inode numbers were 32bit ?
Is there a plan changing this ?
Jakub Kicinski
maintainerQuoted 10 lines · On Tue, 1 Sep 2020 08:55:29 +0200 Eric Dumazet wrote:
Quoted 5 lines · Jakub Kicinski
Dave reports that struct
inet_diag_msg::idiag_inodeis 32 bit, while inode's type is unsigned long. This leads to truncation.Since there is nothing we can do about the size of existing fields - add a new attribute to carry 64 bit inode numbers.
Last time I checked socket inode numbers were 32bit ?
Is there a plan changing this ?
Ugh, you're right that appears to be a local patch :/
I should have checked, sorry for the noise.
Jakub Kicinski
maintainerQuoted 8 lines · On Tue, 1 Sep 2020 09:36:13 -0700 Jakub Kicinski wrote:
Quoted 7 lines · On Tue, 1 Sep 2020 08:55:29 +0200 Eric Dumazet wrote:
Quoted 5 lines · Jakub Kicinski
Dave reports that struct
inet_diag_msg::idiag_inodeis 32 bit, while inode's type is unsigned long. This leads to truncation.Since there is nothing we can do about the size of existing fields - add a new attribute to carry 64 bit inode numbers.
Quoted 7 lines
Quoted 3 lines
Last time I checked socket inode numbers were 32bit ?
Is there a plan changing this ?
Ugh, you're right that appears to be a local patch :/
I should have checked, sorry for the noise.
Looking at get_next_ino() - it seems like the risk of overflow is very real, no? Should we not address this?