nfct: remove lazy binding
Pablo Neira Ayuso
maintainerPATCH 1/1 nfct: remove lazy binding
Since cd5135377ac4 ("conntrackd: cthelper: Set up userspace helpers when daemon starts"), userspace conntrack helpers do not depend on a previous invocation of nfct to set up the userspace helpers.
Move helper definitions to nfct-extensions/helper.c since existing deployments might still invoke nfct, even if not required anymore.
This patch was motivated by the removal of the lazy binding.
Phil Sutter says:
"For security purposes, distributions might want to pass -Wl,-z,now linker flags to all builds, thereby disabling lazy binding globally.
In the past, nfct relied upon lazy binding: It uses the helper objects' parsing functions without but doesn't provide all symbols the objects use."
--- configure.ac | 5 +- include/Makefile.am | 2 +- include/helper.h | 1 + include/helpers/Makefile.am | 1 + include/helpers/ftp.h | 14 +++ include/helpers/rpc.h | 15 +++ include/helpers/sane.h | 13 +++ include/helpers/tns.h | 9 ++ src/Makefile.am | 2 - src/helpers.c | 3 +- src/helpers/Makefile.am | 2 +- src/helpers/ftp.c | 12 +-- src/helpers/rpc.c | 13 +-- src/helpers/sane.c | 10 +- src/helpers/tns.c | 7 +- src/nfct-extensions/helper.c | 184 ++++++++++++++++++++++++++++++++++- 16 files changed, 246 insertions(+), 47 deletions(-) create mode 100644 include/helpers/Makefile.am create mode 100644 include/helpers/ftp.h create mode 100644 include/helpers/rpc.h create mode 100644 include/helpers/sane.h create mode 100644 include/helpers/tns.h
configure.ac +1 -4
@@ -77,15 +77,12 @@ AC_CHECK_HEADERS([linux/capability.h],, [AC_MSG_ERROR([Cannot find linux/capabib AC_CHECK_HEADERS(arpa/inet.h) AC_CHECK_FUNCS(inet_pton) -# Let nfct use dlopen() on helper libraries without resolving all symbols. -AX_CHECK_LINK_FLAG([-Wl,-z,lazy], [AC_SUBST([LAZY_LDFLAGS], [-Wl,-z,lazy])]) - if test ! -z "$libdir"; then MODULE_DIR="\\\"$libdir/conntrack-tools/\\\"" CFLAGS="$CFLAGS -DCONNTRACKD_LIB_DIR=$MODULE_DIR" fi -AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/linux/Makefile include/linux/netfilter/Makefile extensions/Makefile src/helpers/Makefile]) +AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/helpers/Makefile include/linux/Makefile include/linux/netfilter/Makefile extensions/Makefile src/helpers/Makefile]) AC_OUTPUT echo "
include/Makefile.am +1 -1
@@ -1,4 +1,4 @@ -SUBDIRS = linux +SUBDIRS = linux helpers noinst_HEADERS = alarm.h jhash.h cache.h linux_list.h linux_rbtree.h \ sync.h conntrackd.h local.h udp.h tcp.h \
include/helper.h +1 -0
@@ -56,6 +56,7 @@ extern int in4_pton(const char *src, int srclen, uint8_t *dst, int delim, constextern int in6_pton (const char *src,int srclen,uint8_t *dst,int delim,const char **end);extern void helper_register (struct ctd_helper *helper); +struct ctd_helper *__helper_find (const char *helper_name,uint8_t l4proto);struct ctd_helper *helper_find (const char *libdir_path,const char *name,uint8_t l4proto,int flags);#define min_t (type, x, y) ({ \
include/helpers/Makefile.am new file +1 -0
@@ -0,0 +1 @@ +noinst_HEADERS = ftp.h rpc.h sane.h tns.h
include/helpers/ftp.h new file +14 -0
@@ -0,0 +1,14 @@ +#ifndef _CTD_FTP_H +#define _CTD_FTP_H + +#define NUM_SEQ_TO_REMEMBER 2 + +/* This structure exists only once per master */ +struct ftp_info { +/* Valid seq positions for cmd matching after newline */ +uint32_t seq_aft_nl[MYCT_DIR_MAX ][NUM_SEQ_TO_REMEMBER ]; +/* 0 means seq_match_aft_nl not set */ +int seq_aft_nl_num[MYCT_DIR_MAX ]; +}; + +#endif
include/helpers/rpc.h new file +15 -0
@@ -0,0 +1,15 @@ +#ifndef _CTD_RPC_H +#define _CTD_RPC_H + +struct rpc_info { +/* XID */ +uint32_t xid; +/* program */ +uint32_t pm_prog; +/* program version */ +uint32_t pm_vers; +/* transport protocol: TCP|UDP */ +uint32_t pm_prot; +}; + +#endif
include/helpers/sane.h new file +13 -0
@@ -0,0 +1,13 @@ +#ifndef _CTD_SANE_H +#define _CTD_SANE_H + +enum sane_state { +SANE_STATE_NORMAL , +SANE_STATE_START_REQUESTED , +}; + +struct nf_ct_sane_master { +enum sane_state state; +}; + +#endif
include/helpers/tns.h new file +9 -0
@@ -0,0 +1,9 @@ +#ifndef _CTD_TNS_H +#define _CTD_TNS_H + +struct tns_info { +/* Scan next DATA|REDIRECT packet */ +bool parse; +}; + +#endif
src/Makefile.am +0 -2
@@ -35,8 +35,6 @@ if HAVE_CTHELPER nfct_LDADD += ${LIBNETFILTER_CTHELPER_LIBS} endif -nfct_LDFLAGS = -export-dynamic ${LAZY_LDFLAGS} - conntrackd_SOURCES = alarm.c main.c run.c hash.c queue.c queue_tx.c rbtree.c \ local.c log.c mcast.c udp.c netlink.c vector.c \ filter.c fds.c event.c process.c origin.c date.c \
src/helpers.c +1 -2
@@ -26,8 +26,7 @@ void helper_register(struct ctd_helper *helper)list_add (&helper->head, &helper_list); } -static struct ctd_helper * -__helper_find (const char *helper_name,uint8_t l4proto) +struct ctd_helper *__helper_find (const char *helper_name,uint8_t l4proto) {struct ctd_helper *cur, *helper =NULL ;
src/helpers/Makefile.am +1 -1
@@ -11,7 +11,7 @@ pkglib_LTLIBRARIES = ct_helper_amanda.la \ ct_helper_slp.la \ ct_helper_ssdp.la -HELPER_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS) $(LAZY_LDFLAGS) +HELPER_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS) HELPER_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS) ct_helper_amanda_la_SOURCES = amanda.c
src/helpers/ftp.c +2 -10
@@ -36,17 +36,9 @@#include <libnetfilter_queue/pktbuff.h> #include <linux/netfilter.h> -static bool loose;/* XXX: export this as config option. */ - -#define NUM_SEQ_TO_REMEMBER 2 +#include "helpers/ftp.h" -/* This structure exists only once per master */ -struct ftp_info { -/* Valid seq positions for cmd matching after newline */ -uint32_t seq_aft_nl[MYCT_DIR_MAX ][NUM_SEQ_TO_REMEMBER ]; -/* 0 means seq_match_aft_nl not set */ -int seq_aft_nl_num[MYCT_DIR_MAX ]; -}; +static bool loose;/* XXX: export this as config option. */ enum nf_ct_ftp_type {/* PORT command from client */
src/helpers/rpc.c +2 -11
@@ -41,21 +41,12 @@#include <libnetfilter_queue/pktbuff.h> #include <linux/netfilter.h> +#include "helpers/rpc.h" +/* RFC 1050: RPC: Remote Procedure Call Protocol Specification Version 2 */ /* RFC 1014: XDR: External Data Representation Standard */ #define SUPPORTED_RPC_VERSION 2 -struct rpc_info { -/* XID */ -uint32_t xid; -/* program */ -uint32_t pm_prog; -/* program version */ -uint32_t pm_vers; -/* transport protocol: TCP|UDP */ -uint32_t pm_prot; -}; -/* So, this packet has hit the connection tracking matching code. Mangle it, and change the expectation to match the new version. */ static unsigned int
src/helpers/sane.c +1 -9
@@ -39,11 +39,7 @@#include <libnetfilter_queue/libnetfilter_queue_tcp.h> #include <libnetfilter_queue/pktbuff.h> #include <linux/netfilter.h> - -enum sane_state { -SANE_STATE_NORMAL , -SANE_STATE_START_REQUESTED , -}; +#include "helpers/sane.h" struct sane_request {uint32_t RPC_code;
@@ -61,10 +57,6 @@ struct sane_reply_net_start {/* other fields aren't interesting for conntrack */ }; -struct nf_ct_sane_master { -enum sane_state state; -}; -static int sane_helper_cb (struct pkt_buff *pkt,uint32_t protoff,struct myct *myct,uint32_t ctinfo)
src/helpers/tns.c +2 -5
@@ -29,6 +29,8 @@#include <libnetfilter_queue/pktbuff.h> #include <linux/netfilter.h> +#include "helpers/tns.h" +/* TNS SQL*Net Version 2 */ enum tns_types {TNS_TYPE_CONNECT =1 ,
@@ -58,11 +60,6 @@ struct tns_redirect {uint16_t data_len; }; -struct tns_info { -/* Scan next DATA|REDIRECT packet */ -bool parse; -}; -static int try_number (const char *data,size_t dlen,uint32_t array[],int array_size,char sep,char term) {
src/nfct-extensions/helper.c +182 -2
203 lines not on this page · raw message
Signature · 1 line
2.30.2
Quoted 11 lines · Pablo Neira Ayuso
Since
cd5135377ac4("conntrackd: cthelper: Set up userspace helpers when daemon starts"), userspace conntrack helpers do not depend on a previous invocation of nfct to set up the userspace helpers.Move helper definitions to
nfct-extensions/helper.csince existing deployments might still invoke nfct, even if not required anymore.This patch was motivated by the removal of the lazy binding.
Phil Sutter says:
Quoted 8 lines
"For security purposes, distributions might want to pass -Wl,-z,now linker flags to all builds, thereby disabling lazy binding globally.
In the past, nfct relied upon lazy binding: It uses the helper objects' parsing functions without but doesn't provide all symbols the objects use."
Signed-off-by Pablo Neira Ayuso <[email protected]>
Thanks!