Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
e18e37e5
Commit
e18e37e5
authored
Apr 17, 2009
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
parents
a0a69a01
a0142733
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
net/netfilter/nf_conntrack_netlink.c
net/netfilter/nf_conntrack_netlink.c
+6
-4
net/netfilter/nfnetlink.c
net/netfilter/nfnetlink.c
+1
-1
No files found.
net/netfilter/nf_conntrack_netlink.c
View file @
e18e37e5
...
...
@@ -512,7 +512,7 @@ static int ctnetlink_conntrack_event(struct notifier_block *this,
skb
=
ctnetlink_alloc_skb
(
tuple
(
ct
,
IP_CT_DIR_ORIGINAL
),
GFP_ATOMIC
);
if
(
!
skb
)
return
NOTIFY_DONE
;
goto
errout
;
b
=
skb
->
tail
;
...
...
@@ -591,8 +591,9 @@ static int ctnetlink_conntrack_event(struct notifier_block *this,
nla_put_failure:
rcu_read_unlock
();
nlmsg_failure:
nfnetlink_set_err
(
0
,
group
,
-
ENOBUFS
);
kfree_skb
(
skb
);
errout:
nfnetlink_set_err
(
0
,
group
,
-
ENOBUFS
);
return
NOTIFY_DONE
;
}
#endif
/* CONFIG_NF_CONNTRACK_EVENTS */
...
...
@@ -1564,7 +1565,7 @@ static int ctnetlink_expect_event(struct notifier_block *this,
skb
=
alloc_skb
(
NLMSG_GOODSIZE
,
GFP_ATOMIC
);
if
(
!
skb
)
return
NOTIFY_DONE
;
goto
errout
;
b
=
skb
->
tail
;
...
...
@@ -1589,8 +1590,9 @@ static int ctnetlink_expect_event(struct notifier_block *this,
nla_put_failure:
rcu_read_unlock
();
nlmsg_failure:
nfnetlink_set_err
(
0
,
0
,
-
ENOBUFS
);
kfree_skb
(
skb
);
errout:
nfnetlink_set_err
(
0
,
0
,
-
ENOBUFS
);
return
NOTIFY_DONE
;
}
#endif
...
...
net/netfilter/nfnetlink.c
View file @
e18e37e5
...
...
@@ -203,7 +203,7 @@ static int __init nfnetlink_init(void)
nfnetlink_rcv
,
NULL
,
THIS_MODULE
);
if
(
!
nfnl
)
{
printk
(
KERN_ERR
"cannot initialize nfnetlink!
\n
"
);
return
-
1
;
return
-
ENOMEM
;
}
return
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment