2023-02-09 13:06:47

by Igor Artemiev

Subject: [lvc-project] [PATCH] netfilter: xt_recent: Fix attempt to update removed entry

When both --remove and --update flag are specified, there's a code
path at which the entry to be updated is removed beforehand,
that leads to kernel crash. Update entry, if --remove flag
don't specified.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Igor Artemiev <[email protected]>
Fixes: 404bdbfd242c ("[NETFILTER]: recent match: replace by rewritten version")
---
net/netfilter/xt_recent.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/netfilter/xt_recent.c b/net/netfilter/xt_recent.c
index 7ddb9a78e3fc..189a413aa9d8 100644
--- a/net/netfilter/xt_recent.c
+++ b/net/netfilter/xt_recent.c
@@ -315,7 +315,8 @@ recent_mt(const struct sk_buff *skb, struct xt_action_param *par)
}

if (info->check_set & XT_RECENT_SET ||
- (info->check_set & XT_RECENT_UPDATE && ret)) {
+ (info->check_set & XT_RECENT_UPDATE && ret &&
+ !(info->check_set & XT_RECENT_REMOVE))) {
recent_entry_update(t, e);
e->ttl = ttl;
}
--
2.30.2

2023-02-09 15:07:44

by Florian Westphal

Subject: Re: [lvc-project] [PATCH] netfilter: xt_recent: Fix attempt to update removed entry

Igor Artemiev <[email protected]> wrote:
> When both --remove and --update flag are specified, there's a code
> path at which the entry to be updated is removed beforehand,
> that leads to kernel crash. Update entry, if --remove flag
> don't specified.
>
> Found by Linux Verification Center (linuxtesting.org) with SVACE.

How did you manage to do this? --update and --remove are supposed
to be mutually exclusive.

2023-02-09 16:10:08

by Jan Engelhardt

Subject: Re: [lvc-project] [PATCH] netfilter: xt_recent: Fix attempt to update removed entry

On Thursday 2023-02-09 16:07, Florian Westphal wrote:

>Igor Artemiev <[email protected]> wrote:
>> When both --remove and --update flag are specified, there's a code
>> path at which the entry to be updated is removed beforehand,
>> that leads to kernel crash. Update entry, if --remove flag
>> don't specified.
>>
>> Found by Linux Verification Center (linuxtesting.org) with SVACE.
>
>How did you manage to do this? --update and --remove are supposed
>to be mutually exclusive.

I suppose the exclusivity is only checked at the iptables command-line
and neverwhere else.

2023-02-09 20:17:24

by Florian Westphal

Subject: Re: [lvc-project] [PATCH] netfilter: xt_recent: Fix attempt to update removed entry

Jan Engelhardt <[email protected]> wrote:
> On Thursday 2023-02-09 16:07, Florian Westphal wrote:
>
> >Igor Artemiev <[email protected]> wrote:
> >> When both --remove and --update flag are specified, there's a code
> >> path at which the entry to be updated is removed beforehand,
> >> that leads to kernel crash. Update entry, if --remove flag
> >> don't specified.
> >>
> >> Found by Linux Verification Center (linuxtesting.org) with SVACE.
> >
> >How did you manage to do this? --update and --remove are supposed
> >to be mutually exclusive.
>
> I suppose the exclusivity is only checked at the iptables command-line
> and neverwhere else.

Removing the userspace check gives me an -EINVAL from checkentry.