diff options
| -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 |