|
 |
735424 |
From 8ee1e27facf598a1362b29b794e51271b5be4db7 Mon Sep 17 00:00:00 2001
|
|
|
735424 |
From: Robert Marko <robimarko@gmail.com>
|
|
|
735424 |
Date: Thu, 24 Feb 2022 15:01:11 +0100
|
|
|
735424 |
Subject: [PATCH] conntrack: fix build with kernel 5.15 and musl
|
|
|
735424 |
|
|
|
735424 |
Currently, with kernel 5.15 headers and musl building is failing with
|
|
|
735424 |
redefinition errors due to a conflict between the kernel and musl headers.
|
|
|
735424 |
|
|
|
735424 |
Musl is able to suppres the conflicting kernel header definitions if they
|
|
|
735424 |
are included after the standard libc ones, however since ICMP definitions
|
|
|
735424 |
were moved into a separate internal header to avoid duplication this has
|
|
|
735424 |
stopped working and is breaking the builds.
|
|
|
735424 |
|
|
|
735424 |
It seems that the issue is that <netinet/in.h> which contains the UAPI
|
|
|
735424 |
suppression defines is included in the internal.h header and not in the
|
|
|
735424 |
proto.h which actually includes the kernel ICMP headers and thus UAPI
|
|
|
735424 |
supression defines are not present.
|
|
|
735424 |
|
|
|
735424 |
Solve this by moving the <netinet/in.h> include before the ICMP kernel
|
|
|
735424 |
includes in the proto.h
|
|
|
735424 |
|
|
|
735424 |
Fixes: bc1cb4b11403 ("conntrack: Move icmp request>reply type mapping to common file")
|
|
|
735424 |
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
|
735424 |
Signed-off-by: Florian Westphal <fw@strlen.de>
|
|
|
735424 |
(cherry picked from commit 21ee35dde73aec5eba35290587d479218c6dd824)
|
|
|
735424 |
---
|
|
|
735424 |
include/internal/internal.h | 1 -
|
|
|
735424 |
include/internal/proto.h | 1 +
|
|
|
735424 |
2 files changed, 1 insertion(+), 1 deletion(-)
|
|
|
735424 |
|
|
|
735424 |
diff --git a/include/internal/internal.h b/include/internal/internal.h
|
|
|
735424 |
index 2ef8a9057628b..7cd7c44bf8336 100644
|
|
|
735424 |
--- a/include/internal/internal.h
|
|
|
735424 |
+++ b/include/internal/internal.h
|
|
|
735424 |
@@ -14,7 +14,6 @@
|
|
|
735424 |
#include <arpa/inet.h>
|
|
|
735424 |
#include <time.h>
|
|
|
735424 |
#include <errno.h>
|
|
|
735424 |
-#include <netinet/in.h>
|
|
|
735424 |
|
|
|
735424 |
#include <libnfnetlink/libnfnetlink.h>
|
|
|
735424 |
#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
|
|
|
735424 |
diff --git a/include/internal/proto.h b/include/internal/proto.h
|
|
|
735424 |
index 40e7bfe63cc77..60a5f4e4ff8e0 100644
|
|
|
735424 |
--- a/include/internal/proto.h
|
|
|
735424 |
+++ b/include/internal/proto.h
|
|
|
735424 |
@@ -2,6 +2,7 @@
|
|
|
735424 |
#define _NFCT_PROTO_H_
|
|
|
735424 |
|
|
|
735424 |
#include <stdint.h>
|
|
|
735424 |
+#include <netinet/in.h>
|
|
|
735424 |
#include <linux/icmp.h>
|
|
|
735424 |
#include <linux/icmpv6.h>
|
|
|
735424 |
|
|
|
735424 |
--
|
|
|
735424 |
2.38.0
|
|
|
735424 |
|