lkml.org 
[lkml]   [2018]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] uapi: fix linux/netfilter/nf_osf.h userspace compilation errors
    Move inclusion of <linux/ip.h> and <linux/tcp.h> from
    linux/netfilter/xt_osf.h to linux/netfilter/nf_osf.h to fix
    the following linux/netfilter/nf_osf.h userspace compilation errors:

    /usr/include/linux/netfilter/nf_osf.h:59:24: error: 'MAX_IPOPTLEN' undeclared here (not in a function)
    struct nf_osf_opt opt[MAX_IPOPTLEN];
    /usr/include/linux/netfilter/nf_osf.h:64:17: error: field 'ip' has incomplete type
    struct iphdr ip;
    /usr/include/linux/netfilter/nf_osf.h:65:18: error: field 'tcp' has incomplete type
    struct tcphdr tcp;

    Fixes: bfb15f2a95cb ("netfilter: extract Passive OS fingerprint infrastructure from xt_osf")
    Cc: <stable@vger.kernel.org> # v4.18
    Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
    ---
    include/uapi/linux/netfilter/nf_osf.h | 2 ++
    include/uapi/linux/netfilter/xt_osf.h | 2 --
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/include/uapi/linux/netfilter/nf_osf.h b/include/uapi/linux/netfilter/nf_osf.h
    index 8f2f2f403183..eb5c4e20bec0 100644
    --- a/include/uapi/linux/netfilter/nf_osf.h
    +++ b/include/uapi/linux/netfilter/nf_osf.h
    @@ -2,6 +2,8 @@
    #define _NF_OSF_H

    #include <linux/types.h>
    +#include <linux/ip.h>
    +#include <linux/tcp.h>

    #define MAXGENRELEN 32

    diff --git a/include/uapi/linux/netfilter/xt_osf.h b/include/uapi/linux/netfilter/xt_osf.h
    index 72956eceeb09..f1abe4c6f59d 100644
    --- a/include/uapi/linux/netfilter/xt_osf.h
    +++ b/include/uapi/linux/netfilter/xt_osf.h
    @@ -21,8 +21,6 @@
    #define _XT_OSF_H

    #include <linux/types.h>
    -#include <linux/ip.h>
    -#include <linux/tcp.h>
    #include <linux/netfilter/nf_osf.h>

    #define XT_OSF_GENRE NF_OSF_GENRE
    --
    ldv
    \
     
     \ /
      Last update: 2018-08-13 17:53    [W:8.138 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site