netfilter: nf_conntrack_expect: zero at allocation time
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 netfilter: nf_conntrack_expect: zero at allocation time
There are occasional LLM hints wrt. leaking uninitialized data to userspace via ctnetlink. Just zero at allocation time, expectations are not frequently used these days.
Intentionally keeps _init as-is because we could theoretically support re-init, so add the missing exp->dir there.
--- net/netfilter/nf_conntrack_expect.c | 3 ++- net/netfilter/nf_conntrack_netlink.c | 11 +---------- 2 files changed, 3 insertions(+), 11 deletions(-)
net/netfilter/nf_conntrack_expect.c +2 -1
@@ -306,7 +306,7 @@ struct nf_conntrack_expect *nf_ct_expect_alloc(struct nf_conn *me) {struct nf_conntrack_expect *new; - new =kmem_cache_alloc (nf_ct_expect_cachep,GFP_ATOMIC ); + new =kmem_cache_zalloc (nf_ct_expect_cachep,GFP_ATOMIC );if (!new)return NULL ;
@@ -389,6 +389,7 @@ void nf_ct_expect_init(struct nf_conntrack_expect *exp, unsigned int class,#if IS_ENABLED (CONFIG_NF_NAT )memset (&exp->saved_addr,0 ,sizeof (exp->saved_addr));memset (&exp->saved_proto,0 ,sizeof (exp->saved_proto)); + exp->dir =0 ;#endif }EXPORT_SYMBOL_GPL (nf_ct_expect_init);
net/netfilter/nf_conntrack_netlink.c +1 -10
@@ -3565,8 +3565,6 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct,if (cda[CTA_EXPECT_FLAGS ]) { exp->flags =ntohl (nla_get_be32 (cda[CTA_EXPECT_FLAGS ])); exp->flags &= ~NF_CT_EXPECT_USERSPACE ; - }else { - exp->flags =0 ; }if (cda[CTA_EXPECT_FN ]) {const char *name =nla_data (cda[CTA_EXPECT_FN ]);
@@ -3578,8 +3576,7 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct, goto err_out; } exp->expectfn = expfn->expectfn; - }else - exp->expectfn =NULL ; + } exp->class = class; exp->master = ct;
@@ -3598,12 +3595,6 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct, exp, nf_ct_l3num(ct));if (err <0 ) goto err_out; -#if IS_ENABLED (CONFIG_NF_NAT ) - } else { -memset (&exp->saved_addr,0 ,sizeof (exp->saved_addr)); -memset (&exp->saved_proto,0 ,sizeof (exp->saved_proto)); - exp->dir =0 ; -#endif }return exp; err_out:
Signature · 1 line
2.53.0
Pablo Neira Ayuso
maintainerQuoted 3 lines · Florian Westphal
There are occasional LLM hints wrt. leaking uninitialized data to userspace via ctnetlink. Just zero at allocation time, expectations are not frequently used these days.
Fine with me. IIRC hints came because of real issue, ie. paths where I was missing to initial something.
Quoted 23 lines
Intentionally keeps
_initas-is because we could theoretically support re-init, so add the missingexp->dirthere.Signed-off-by Florian Westphal <[email protected]>--- net/netfilter/nf_conntrack_expect.c | 3 ++- net/netfilter/nf_conntrack_netlink.c | 11 +---------- 2 files changed, 3 insertions(+), 11 deletions(-)net/netfilter/nf_conntrack_expect.c +1
-1@@ -306,7 +306,7 @@ struct nf_conntrack_expect *nf_ct_expect_alloc(struct nf_conn *me) {struct nf_conntrack_expect *new; - new =kmem_cache_alloc (nf_ct_expect_cachep,GFP_ATOMIC ); + new =kmem_cache_zalloc (nf_ct_expect_cachep,GFP_ATOMIC );if (!new)return NULL ;
net/netfilter/nf_conntrack_expect.c void nf_ct_expect_init(struct nf_conntrack_expect *exp, unsigned int class, · line 392
Quoted 4 lines
net/netfilter/nf_conntrack_expect.c +1
-0@@ -389,6 +389,7 @@ void nf_ct_expect_init(struct nf_conntrack_expect *exp, unsigned int class,#if IS_ENABLED (CONFIG_NF_NAT )memset (&exp->saved_addr,0 ,sizeof (exp->saved_addr));memset (&exp->saved_proto,0 ,sizeof (exp->saved_proto)); + exp->dir =0 ;
Hm. But now area is expect is zeroed, right?
Maybe nf_ct_expect_init() needs to be updated to remove needless zeroing too?
Thanks!
Quoted 43 lines
net/netfilter/nf_conntrack_expect.c +0
-0#endif }EXPORT_SYMBOL_GPL (nf_ct_expect_init);net/netfilter/nf_conntrack_netlink.c +1
-10@@ -3565,8 +3565,6 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct,if (cda[CTA_EXPECT_FLAGS ]) { exp->flags =ntohl (nla_get_be32 (cda[CTA_EXPECT_FLAGS ])); exp->flags &= ~NF_CT_EXPECT_USERSPACE ; - }else { - exp->flags =0 ; }if (cda[CTA_EXPECT_FN ]) {const char *name =nla_data (cda[CTA_EXPECT_FN ]);@@ -3578,8 +3576,7 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct, goto err_out; } exp->expectfn = expfn->expectfn; - }else - exp->expectfn =NULL ; + } exp->class = class; exp->master = ct;@@ -3598,12 +3595,6 @@ ctnetlink_alloc_expect(const struct nlattr * const cda[], struct nf_conn *ct, exp, nf_ct_l3num(ct));if (err <0 ) goto err_out; -#if IS_ENABLED (CONFIG_NF_NAT ) - } else { -memset (&exp->saved_addr,0 ,sizeof (exp->saved_addr)); -memset (&exp->saved_proto,0 ,sizeof (exp->saved_proto)); - exp->dir =0 ; -#endif }return exp; err_out:Signature · 1 line
2.53.0
Florian Westphal
maintainerQuoted 17 lines · Pablo Neira Ayuso
Quoted 3 lines · Florian Westphal
There are occasional LLM hints wrt. leaking uninitialized data to userspace via ctnetlink. Just zero at allocation time, expectations are not frequently used these days.
Fine with me. IIRC hints came because of real issue, ie. paths where I was missing to initial something.
net/netfilter/nf_conntrack_expect.c void nf_ct_expect_init(struct nf_conntrack_expect *exp, unsigned int class, · line 392
Quoted 5 lines
net/netfilter/nf_conntrack_expect.c +1
-0@@ -389,6 +389,7 @@ void nf_ct_expect_init(struct nf_conntrack_expect *exp, unsigned int class,#if IS_ENABLED (CONFIG_NF_NAT )memset (&exp->saved_addr,0 ,sizeof (exp->saved_addr));memset (&exp->saved_proto,0 ,sizeof (exp->saved_proto)); + exp->dir =0 ;Hm. But now area is expect is zeroed, right?
Quoted 2 lines
Maybe
nf_ct_expect_init()needs to be updated to remove needless zeroing too?
See:
Quoted 2 lines
Quoted 2 lines
Intentionally keeps
_initas-is because we could theoretically support re-init, so add the missingexp->dirthere.
If you say we are guaranteed to always have:
exp = nf_ct_expect_alloc(ct);nf_ct_expect_init(exp)
then we could remove it. But then I'd question why we even have this alloc / init split and not:
exp = nf_ct_expect_new(rtp_exp, NF_CT_EXPECT_CLASS_DEFAULT, nf_ct_l3num(ct),
&ct->tuplehash[!dir].tuple.src.u3,
&ct->tuplehash[!dir].tuple.dst.u3,
IPPROTO_UDP, NULL, &rtp_port);Pablo Neira Ayuso
maintainerHi Florian,
Quoted 21 lines · Florian Westphal
Quoted 17 lines · Pablo Neira Ayuso
Quoted 3 lines · Florian Westphal
There are occasional LLM hints wrt. leaking uninitialized data to userspace via ctnetlink. Just zero at allocation time, expectations are not frequently used these days.
Fine with me. IIRC hints came because of real issue, ie. paths where I was missing to initial something.
net/netfilter/nf_conntrack_expect.c void nf_ct_expect_init(struct nf_conntrack_expect *exp, unsigned int class, · line 392
Quoted 5 lines
net/netfilter/nf_conntrack_expect.c +1
-0@@ -389,6 +389,7 @@ void nf_ct_expect_init(struct nf_conntrack_expect *exp, unsigned int class,#if IS_ENABLED (CONFIG_NF_NAT )memset (&exp->saved_addr,0 ,sizeof (exp->saved_addr));memset (&exp->saved_proto,0 ,sizeof (exp->saved_proto)); + exp->dir =0 ;Hm. But now area is expect is zeroed, right?
Quoted 2 lines
Maybe
nf_ct_expect_init()needs to be updated to remove needless zeroing too?
Quoted 8 lines
See:
Quoted 2 lines
Quoted 2 lines
Intentionally keeps
_initas-is because we could theoretically support re-init, so add the missingexp->dirthere.If you say we are guaranteed to always have:
exp =
nf_ct_expect_alloc(ct);nf_ct_expect_init(exp)
IIRC, this API was already around when I came here...
Quoted 7 lines
then we could remove it. But then I'd question why we even have this alloc / init split and not:
exp = nf_ct_expect_new(rtp_exp,
NF_CT_EXPECT_CLASS_DEFAULT,nf_ct_l3num(ct),&ct->tuplehash[!dir].tuple.src.u3, &ct->tuplehash[!dir].tuple.dst.u3, IPPROTO_UDP, NULL, &rtp_port);
... so yes, that's possible.
IIRC, there are only two spots that opencode the expectation initilization:
- ctnetlink_alloc_expect()
- nf_conntrack_broadcast.c
Let me complete my series to turn exp->master into a cookie. I started a series for nf-next to achieve this, I am ready to post the initial preparation patches that reduce the number of exp->master references in the tree.