diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-01-10 15:24:15 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-01-10 15:32:16 +0100 |
| commit | cbef426ce725d46beb5ba84b9e9eb624c25462dd (patch) | |
| tree | 94985257cb448134f309d3963c476a8c39618749 /net | |
| parent | 99eadf67c8fe0d9ebe5f4a2b1551d8238b4a43bf (diff) | |
| download | linux-stable-cbef426ce725d46beb5ba84b9e9eb624c25462dd.tar.gz linux-stable-cbef426ce725d46beb5ba84b9e9eb624c25462dd.tar.bz2 linux-stable-cbef426ce725d46beb5ba84b9e9eb624c25462dd.zip | |
netfilter: core: return EBUSY in case NAT hook is already in use
EEXIST is used for an object that already exists, with the same
name/handle. However, there no same object there, instead there is a
object that is using the single slot that is available for NAT hooks
since patch f92b40a8b264 ("netfilter: core: only allow one nat hook per
hook point"). Let's change this return value before this behaviour gets
exposed in the first -rc.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/core.c b/net/netfilter/core.c index 3f8e2d06b9cc..0f6b8172fb9a 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -140,7 +140,7 @@ nf_hook_entries_grow(const struct nf_hook_entries *old, if (reg->nat_hook && orig_ops[i]->nat_hook) { kvfree(new); - return ERR_PTR(-EEXIST); + return ERR_PTR(-EBUSY); } if (inserted || reg->priority > orig_ops[i]->priority) { |