[PATCH libnetfilter_queue 0/2] Miscellaneous fixes

[PATCH libnetfilter_queue 0/2] Miscellaneous fixes

[Duncan Roe]

I came across these while updating documentation.
So, I haven't actually exercised the code.

Duncan Roe (2):
  src: pktb_trim() was not updating tail after updating len
  src: Make sure pktb_alloc() works for AF_INET6 since we document that
    it does

 src/extra/pktbuff.c | 2 ++
 1 file changed, 2 insertions(+)

-- 
2.14.5

[PATCH libnetfilter_queue 1/2] src: pktb_trim() was not updating tail after updating len

[Duncan Roe]

skb->tail is used in many places, so it's important to keep it up to date.

Updated:

 src/extra/pktbuff.c: Fix pktb_trim()

Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au>
---
 src/extra/pktbuff.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/extra/pktbuff.c b/src/extra/pktbuff.c
index 00af037..3a08d49 100644
--- a/src/extra/pktbuff.c
+++ b/src/extra/pktbuff.c
@@ -156,6 +156,7 @@ EXPORT_SYMBOL
 void pktb_trim(struct pkt_buff *pktb, unsigned int len)
 {
 	pktb->len = len;
+	pktb->tail = pktb->head + len;
 }
 
 /**
-- 
2.14.5

[PATCH libnetfilter_queue 2/2] src: Make sure pktb_alloc() works for AF_INET6 since we document that it does

[Duncan Roe]

Without this patch, AF_INET6 pktb_alloc() creates a pktb with NULL
network_header. But in src/extra/ipv6.c, nfq_ip6_get_hdr() assumes that
pktb->network_header is valid.

Updated:

 src/extra/pktbuff.c: Treat AF_INET6 the same as AF_INET.

Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au>
---
 src/extra/pktbuff.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/extra/pktbuff.c b/src/extra/pktbuff.c
index 3a08d49..c52b674 100644
--- a/src/extra/pktbuff.c
+++ b/src/extra/pktbuff.c
@@ -63,6 +63,7 @@ struct pkt_buff *pktb_alloc(int family, void *data, size_t len, size_t extra)
 
 	switch(family) {
 	case AF_INET:
+	case AF_INET6:
 		pktb->network_header = pktb->data;
 		break;
 	case AF_BRIDGE: {
-- 
2.14.5

Re: [PATCH libnetfilter_queue 0/2] Miscellaneous fixes

[Pablo Neira Ayuso]

On Mon, Nov 11, 2019 at 03:17:21PM +1100, Duncan Roe wrote:
> I came across these while updating documentation.

Applied, thanks.