Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nat_events: remove rcu_dereference from saved cb #212

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

nat_events: remove rcu_dereference from saved cb #212

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions ipt_NETFLOW.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4600,12 +4600,9 @@ static struct nf_ct_event_notifier *saved_event_cb __read_mostly = NULL;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,15,0)
static int netflow_conntrack_expect_event(const unsigned int events, const struct nf_exp_event *item)
{
struct nf_ct_event_notifier *notifier;

/* Call netlink first. */
notifier = rcu_dereference(saved_event_cb);
if (likely(notifier))
return notifier->exp_event(events, item);
if (likely(saved_event_cb))
return saved_event_cb->exp_event(events, item);
else
return 0;
}
Expand All @@ -4627,12 +4624,9 @@ static int netflow_conntrack_event(struct notifier_block *this, unsigned long ev
const struct nf_conntrack_tuple *t;
int ret = NOTIFY_DONE;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
struct nf_ct_event_notifier *notifier;

/* Call netlink first. */
notifier = rcu_dereference(saved_event_cb);
if (likely(notifier))
ret = notifier->ct_event(events, item);
if (likely(saved_event_cb))
ret = saved_event_cb->ct_event(events, item);
#endif
if (unlikely(!natevents))
return ret;
Expand Down