From: Chengen Du <chengen.du@canonical.com>
To: Florian Westphal <fw@strlen.de>
Cc: Michal Kubiak <michal.kubiak@intel.com>,
jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us,
davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, ozsh@nvidia.com, paulb@nvidia.com,
marcelo.leitner@gmail.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Gerald Yang <gerald.yang@canonical.com>
Subject: Re: [PATCH net v2] net/sched: Fix UAF when resolving a clash
Date: Sat, 6 Jul 2024 09:42:00 +0800 [thread overview]
Message-ID: <CAPza5qdAzt7ztcA=8sBhLZiiGp2THZF+1yFcbsm3+Ed8pDYSHg@mail.gmail.com> (raw)
In-Reply-To: <20240705093525.GA30758@breakpoint.cc>
On Fri, Jul 5, 2024 at 5:35 PM Florian Westphal <fw@strlen.de> wrote:
>
> Michal Kubiak <michal.kubiak@intel.com> wrote:
> > On Fri, Jul 05, 2024 at 10:50:56AM +0800, Chengen Du wrote:
> > The ct may be dropped if a clash has been resolved but is still passed to
> > > the tcf_ct_flow_table_process_conn function for further usage. This issue
> > > can be fixed by retrieving ct from skb again after confirming conntrack.
>
> Right, ct can be stale after confirm.
>
> > > diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c
> > > index 2a96d9c1db65..6f41796115e3 100644
> > > --- a/net/sched/act_ct.c
> > > +++ b/net/sched/act_ct.c
> > > @@ -1077,6 +1077,14 @@ TC_INDIRECT_SCOPE int tcf_ct_act(struct sk_buff *skb, const struct tc_action *a,
> > > */
> > > if (nf_conntrack_confirm(skb) != NF_ACCEPT)
> > > goto drop;
> > > +
> > > + /* The ct may be dropped if a clash has been resolved,
> > > + * so it's necessary to retrieve it from skb again to
> > > + * prevent UAF.
> > > + */
> > > + ct = nf_ct_get(skb, &ctinfo);
> > > + if (!ct)
> > > + goto drop;
> >
> > After taking a closer look at this change, I have a question: Why do we
> > need to change an action returned by "nf_conntrack_confirm()"
> > (NF_ACCEPT) and actually perform the flow for NF_DROP?
> >
> > From the commit message I understand that you only want to prevent
> > calling "tcf_ct_flow_table_process_conn()". But for such reason we have
> > a bool variable: "skip_add".
> > Shouldn't we just set "skip_add" to true to prevent the UAF?
> > Would the following example code make sense in this case?
> >
> > ct = nf_ct_get(skb, &ctinfo);
> > if (!ct)
> > skip_add = true;
The fix is followed by the KASAN analysis. The ct is freed while
resolving a clash in the __nf_ct_resolve_clash function, but it is
still accessed in the tcf_ct_flow_table_process_conn function. If I
understand correctly, the original logic still adds the ct to the flow
table after resolving a clash once the skip_add is false. The chance
of encountering a drop case is rare because the skb's ct is already
substituted into the hashes one. However, if we still encounter a NULL
ct, the situation is unusual and might warrant dropping it as a
precaution. I am not an expert in this area and might have some
misunderstandings. Please share your opinions if you have any
concerns.
>
> It depends on what tc wants do to here.
>
> For netfilter, the skb is not dropped and continues passing
> through the stack. Its up to user to decide what to do with it,
> e.g. doing "ct state invalid drop".
next prev parent reply other threads:[~2024-07-06 1:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-05 2:50 [PATCH net v2] net/sched: Fix UAF when resolving a clash Chengen Du
2024-07-05 8:21 ` Michal Kubiak
2024-07-05 9:35 ` Florian Westphal
2024-07-06 1:42 ` Chengen Du [this message]
2024-07-08 8:33 ` Michal Kubiak
2024-07-08 9:39 ` Chengen Du
2024-07-09 10:40 ` Paolo Abeni
2024-07-10 5:15 ` Chengen Du
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPza5qdAzt7ztcA=8sBhLZiiGp2THZF+1yFcbsm3+Ed8pDYSHg@mail.gmail.com' \
--to=chengen.du@canonical.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=fw@strlen.de \
--cc=gerald.yang@canonical.com \
--cc=jhs@mojatatu.com \
--cc=jiri@resnulli.us \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo.leitner@gmail.com \
--cc=michal.kubiak@intel.com \
--cc=netdev@vger.kernel.org \
--cc=ozsh@nvidia.com \
--cc=pabeni@redhat.com \
--cc=paulb@nvidia.com \
--cc=xiyou.wangcong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).