diff options
| author |   Nicholas Vinson <nvinson234@gmail.com> | 2016-07-10 15:07:00 -0700 |
|---|---|---|
| committer |   Sam Jorna <wraeth@gentoo.org> | 2016-07-11 17:35:24 +1000 |
| commit | 43c988c13be72ad3b4444b9fcd96b4377743ced9 (patch) | |
| tree | 82e3c77fb85e2f670607062231389011da7d1ef7 /net-firewall | |
| parent | kde-frameworks/extra-cmake-modules: keyword ~ppc (diff) | |
| download | gentoo-43c988c13be72ad3b4444b9fcd96b4377743ced9.tar.gz gentoo-43c988c13be72ad3b4444b9fcd96b4377743ced9.tar.bz2 gentoo-43c988c13be72ad3b4444b9fcd96b4377743ced9.zip | |
net-firewall/nftables: backport null payload desc fix
nftables-0.6 handling of payload context descriptions was changed from
version 0.5. This change causes the code to segfault when the desc
variable in payload_expr_pctx_update() is set to null. The issue
appears to be fixed with upstream commit
3503738f77cdbe521da1054a37f59ac2e442b4cf. Therefore, backporting that
commit to 0.6 to fix this issue.
Gentoo-bug: 588192
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/1865
Diffstat (limited to 'net-firewall')
| -rw-r--r-- | net-firewall/nftables/files/nftables-0.6-null-payload-desc-fix.patch | 14 | ||||
| -rw-r--r-- | net-firewall/nftables/nftables-0.6-r2.ebuild (renamed from net-firewall/nftables/nftables-0.6-r1.ebuild) | 5 |
2 files changed, 18 insertions, 1 deletions
diff --git a/net-firewall/nftables/files/nftables-0.6-null-payload-desc-fix.patch b/net-firewall/nftables/files/nftables-0.6-null-payload-desc-fix.patch new file mode 100644 index 000000000000..3ea59e7aa490 --- /dev/null +++ b/net-firewall/nftables/files/nftables-0.6-null-payload-desc-fix.patch @@ -0,0 +1,14 @@ +diff --git a/src/payload.c b/src/payload.c +index ac0e917..9ba980a 100644 +--- a/src/payload.c ++++ b/src/payload.c +@@ -85,6 +85,9 @@ static void payload_expr_pctx_update(struct proto_ctx *ctx, + base = ctx->protocol[left->payload.base].desc; + desc = proto_find_upper(base, proto); + ++ if (!desc) ++ return; ++ + assert(desc->base <= PROTO_BASE_MAX); + if (desc->base == base->base) { + assert(base->length > 0); diff --git a/net-firewall/nftables/nftables-0.6-r1.ebuild b/net-firewall/nftables/nftables-0.6-r2.ebuild index 550c6da95816..7874baf0062b 100644 --- a/net-firewall/nftables/nftables-0.6-r1.ebuild +++ b/net-firewall/nftables/nftables-0.6-r2.ebuild @@ -28,7 +28,10 @@ DEPEND="${RDEPEND} S="${WORKDIR}/v${PV}" -PATCHES=( "${FILESDIR}/${PN}-0.5-pdf-doc.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-0.5-pdf-doc.patch" + "${FILESDIR}/${P}-null-payload-desc-fix.patch" +) pkg_setup() { if kernel_is ge 3 13; then |