libnetfilter_queue-1.0.5-1.el9
- Rebase onto upstream version 1.0.5 Resolves: rhbz#1993305
This commit is contained in:
Phil Sutter
parent
5f1a85322a
commit
f0685f22c0
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@ libnetfilter_queue-0.0.17.tar.bz2
|
||||
libnetfilter_queue-1.0.0.tar.bz2
|
||||
/libnetfilter_queue-1.0.1.tar.bz2
|
||||
/libnetfilter_queue-1.0.2.tar.bz2
|
||||
/libnetfilter_queue-1.0.5.tar.bz2
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
From 3065fb3642c8e554432059629808a62560e2184f Mon Sep 17 00:00:00 2001
|
||||
From: Ting-Wei Lan <lantw44@gmail.com>
|
||||
Date: Fri, 20 Jun 2014 18:26:59 +0800
|
||||
Subject: [PATCH] extra: use inet_ntop instead of inet_ntoa
|
||||
|
||||
The result of inet_ntoa() will be overwritten by the next call to
|
||||
inet_ntoa(), so using it twice in the same snprintf() call causes
|
||||
wrong result.
|
||||
|
||||
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
||||
---
|
||||
src/extra/ipv4.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/extra/ipv4.c b/src/extra/ipv4.c
|
||||
index 0fe716ba4697c..a93d113fb23cf 100644
|
||||
--- a/src/extra/ipv4.c
|
||||
+++ b/src/extra/ipv4.c
|
||||
@@ -134,9 +134,13 @@ int nfq_ip_snprintf(char *buf, size_t size, const struct iphdr *iph)
|
||||
struct in_addr src = { iph->saddr };
|
||||
struct in_addr dst = { iph->daddr };
|
||||
|
||||
+ char src_str[INET_ADDRSTRLEN];
|
||||
+ char dst_str[INET_ADDRSTRLEN];
|
||||
+
|
||||
ret = snprintf(buf, size, "SRC=%s DST=%s LEN=%u TOS=0x%X "
|
||||
"PREC=0x%X TTL=%u ID=%u PROTO=%u ",
|
||||
- inet_ntoa(src), inet_ntoa(dst),
|
||||
+ inet_ntop(AF_INET, &src, src_str, INET_ADDRSTRLEN),
|
||||
+ inet_ntop(AF_INET, &dst, dst_str, INET_ADDRSTRLEN),
|
||||
ntohs(iph->tot_len), IPTOS_TOS(iph->tos),
|
||||
IPTOS_PREC(iph->tos), iph->ttl, ntohs(iph->id),
|
||||
iph->protocol);
|
||||
--
|
||||
2.31.0
|
||||
|
||||
58
0001-src-fix-IPv6-header-handling.patch
Normal file
58
0001-src-fix-IPv6-header-handling.patch
Normal file
@ -0,0 +1,58 @@
|
||||
From 89c17c1a301b3df0ae3b430a105f3208a0c6b53e Mon Sep 17 00:00:00 2001
|
||||
From: Etan Kissling <etan_kissling@apple.com>
|
||||
Date: Tue, 9 Feb 2021 23:51:33 +0100
|
||||
Subject: [PATCH] src: fix IPv6 header handling
|
||||
|
||||
This corrects issues in IPv6 header handling that sometimes resulted
|
||||
in an endless loop.
|
||||
|
||||
Signed-off-by: Etan Kissling <etan_kissling@apple.com>
|
||||
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
(cherry picked from commit 51f25df304aeaa6c1b02ef7456a61278ee70c102)
|
||||
---
|
||||
src/extra/ipv6.c | 15 +++++++++++++--
|
||||
1 file changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/extra/ipv6.c b/src/extra/ipv6.c
|
||||
index 42c5e25054dff..23f64ba6706b8 100644
|
||||
--- a/src/extra/ipv6.c
|
||||
+++ b/src/extra/ipv6.c
|
||||
@@ -67,10 +67,19 @@ int nfq_ip6_set_transport_header(struct pkt_buff *pktb, struct ip6_hdr *ip6h,
|
||||
uint8_t nexthdr = ip6h->ip6_nxt;
|
||||
uint8_t *cur = (uint8_t *)ip6h + sizeof(struct ip6_hdr);
|
||||
|
||||
- while (nexthdr != target) {
|
||||
+ while (nexthdr == IPPROTO_HOPOPTS ||
|
||||
+ nexthdr == IPPROTO_ROUTING ||
|
||||
+ nexthdr == IPPROTO_FRAGMENT ||
|
||||
+ nexthdr == IPPROTO_AH ||
|
||||
+ nexthdr == IPPROTO_NONE ||
|
||||
+ nexthdr == IPPROTO_DSTOPTS) {
|
||||
struct ip6_ext *ip6_ext;
|
||||
uint32_t hdrlen;
|
||||
|
||||
+ /* Extension header was requested, we're done. */
|
||||
+ if (nexthdr == target)
|
||||
+ break;
|
||||
+
|
||||
/* No more extensions, we're done. */
|
||||
if (nexthdr == IPPROTO_NONE) {
|
||||
cur = NULL;
|
||||
@@ -107,11 +116,13 @@ int nfq_ip6_set_transport_header(struct pkt_buff *pktb, struct ip6_hdr *ip6h,
|
||||
} else if (nexthdr == IPPROTO_AH)
|
||||
hdrlen = (ip6_ext->ip6e_len + 2) << 2;
|
||||
else
|
||||
- hdrlen = ip6_ext->ip6e_len;
|
||||
+ hdrlen = (ip6_ext->ip6e_len + 1) << 3;
|
||||
|
||||
nexthdr = ip6_ext->ip6e_nxt;
|
||||
cur += hdrlen;
|
||||
}
|
||||
+ if (nexthdr != target)
|
||||
+ cur = NULL;
|
||||
pktb->transport_header = cur;
|
||||
return cur ? 1 : 0;
|
||||
}
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
%define libnfnetlink 1.0.1
|
||||
|
||||
Name: libnetfilter_queue
|
||||
Version: 1.0.2
|
||||
Release: 20%{?dist}
|
||||
Version: 1.0.5
|
||||
Release: 1%{?dist}
|
||||
Summary: Netfilter queue userspace library
|
||||
# Most files say GPLv2+, one says v2 only.
|
||||
License: GPLv2
|
||||
URL: http://netfilter.org
|
||||
Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2
|
||||
|
||||
Patch1: 0001-extra-use-inet_ntop-instead-of-inet_ntoa.patch
|
||||
Patch1: 0001-src-fix-IPv6-header-handling.patch
|
||||
|
||||
BuildRequires: libnfnetlink-devel >= %{libnfnetlink}, pkgconfig, kernel-headers
|
||||
BuildRequires: autoconf, automake, libtool, libmnl-devel >= 1.0.3
|
||||
@ -45,7 +45,6 @@ make %{?_smp_mflags}
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make DESTDIR=%{buildroot} install
|
||||
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
|
||||
rm %{buildroot}/%{_includedir}/internal.h
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
@ -60,6 +59,9 @@ rm %{buildroot}/%{_includedir}/internal.h
|
||||
%{_libdir}/pkgconfig/%{name}.pc
|
||||
|
||||
%changelog
|
||||
* Fri Aug 13 2021 Phil Sutter <psutter@redhat.com> - 1.0.5-1
|
||||
- Rebase onto upstream version 1.0.5
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.2-20
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
Loading…
Reference in New Issue
Block a user