netfilter: nfnetlink_osf: fix possible bogus match in nf_osf_find()
[ Upstream commit 559c36c5a8d730c49ef805a72b213d3bba155cc8 ]
nf_osf_find() incorrectly returns true on mismatch, this leads to
copying uninitialized memory area in nft_osf which can be used to leak
stale kernel stack data to userspace.
Fixes: 22c7652cda
("netfilter: nft_osf: Add version option support")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
9a5d7e0acb
commit
5d75fef3e6
@@ -269,6 +269,7 @@ bool nf_osf_find(const struct sk_buff *skb,
|
|||||||
struct nf_osf_hdr_ctx ctx;
|
struct nf_osf_hdr_ctx ctx;
|
||||||
const struct tcphdr *tcp;
|
const struct tcphdr *tcp;
|
||||||
struct tcphdr _tcph;
|
struct tcphdr _tcph;
|
||||||
|
bool found = false;
|
||||||
|
|
||||||
memset(&ctx, 0, sizeof(ctx));
|
memset(&ctx, 0, sizeof(ctx));
|
||||||
|
|
||||||
@@ -283,10 +284,11 @@ bool nf_osf_find(const struct sk_buff *skb,
|
|||||||
|
|
||||||
data->genre = f->genre;
|
data->genre = f->genre;
|
||||||
data->version = f->version;
|
data->version = f->version;
|
||||||
|
found = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return found;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(nf_osf_find);
|
EXPORT_SYMBOL_GPL(nf_osf_find);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user