Skip to contentSkip to conversation

headers_check fix: linux/netfilter/xt_osf.h

PATCH Applied Jaswinder Singh Rajput 4 participants 6 messages Jun 27, 2009 – Jun 29, 2009 netfilter

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 headers_check fix: linux/netfilter/xt_osf.h

fix the following 'make headers_check' warnings:

usr/include/linux/netfilter/xt_osf.h:40: found __[us]{8,16,32,64} type without #include <linux/types.h>

---
 include/linux/netfilter/xt_osf.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
include/linux/netfilter/xt_osf.h +2 -0
index fd2272e..18afa49 100644
@@ -20,6 +20,8 @@
 #ifndef _XT_OSF_H
 #define _XT_OSF_H
 
+#include <linux/types.h>
+
 #define MAXGENRELEN		32
 
 #define XT_OSF_GENRE		(1<<0)
Signature · 1 line
1.6.0.6
#1 lore raw

Hi.

Quoted 5 lines · Jaswinder Singh Rajput

fix the following 'make headers_check' warnings:

usr/include/linux/netfilter/xt_osf.h:40: found __[us]{8,16,32,64} type without #include <linux/types.h>

Looks good, thank you.
Patrick, please apply.

Signature · 1 line
	Evgeniy Polyakov
#2 lore raw
Quoted 11 lines · Evgeniy Polyakov

Hi.

Quoted 5 lines · Jaswinder Singh Rajput

fix the following 'make headers_check' warnings:

usr/include/linux/netfilter/xt_osf.h:40: found __[us]{8,16,32,64} type without #include <linux/types.h>

Looks good, thank you.
Patrick, please apply.

What about the other potential issues in the same file?

struct xt_osf_opt {
        __u16                   kind, length;
        struct xt_osf_wc        wc;
};

Do we know that struct xt_osf_wc is always aligned at a two byte address also on 64 bit?
Do we know that sizeof(struct xt_osf_opt) is the same on all platforms?

struct xt_osf_user_finger {
        struct xt_osf_wc        wss;

        __u8                    ttl, df;
        __u16                   ss, mss;
        __u16                   opt_num;

        char                    genre[MAXGENRELEN];
        char                    version[MAXGENRELEN];
        char                    subtype[MAXGENRELEN];

        /* MAX_IPOPTLEN is maximum if all options are NOPs or EOLs */
        struct xt_osf_opt       opt[MAX_IPOPTLEN];
};

Do we know that opt[MAX_IPOPTLEN] always start at the same offset with different architectures?

struct xt_osf_nlmsg {
        struct xt_osf_user_finger       f;
        struct iphdr            ip;
        struct tcphdr           tcp;
};

We do not knwo struct iphdr/tcphdr - missing include. Do we know the alignment of the above structs? Are they always the same on all archs?

Sam

#3 lore raw
Quoted 48 lines · Sam Ravnborg
Quoted 11 lines · Evgeniy Polyakov

Hi.

Quoted 5 lines · Jaswinder Singh Rajput

fix the following 'make headers_check' warnings:

usr/include/linux/netfilter/xt_osf.h:40: found __[us]{8,16,32,64} type without #include <linux/types.h>

Looks good, thank you.
Patrick, please apply.

What about the other potential issues in the same file?

struct xt_osf_opt {
        __u16                   kind, length;
        struct xt_osf_wc        wc;
};

Do we know that struct xt_osf_wc is always aligned at a two byte address also on 64 bit?
Do we know that sizeof(struct xt_osf_opt) is the same on all platforms?

struct xt_osf_user_finger {
        struct xt_osf_wc        wss;

        __u8                    ttl, df;
        __u16                   ss, mss;
        __u16                   opt_num;

        char                    genre[MAXGENRELEN];
        char                    version[MAXGENRELEN];
        char                    subtype[MAXGENRELEN];

        /* MAX_IPOPTLEN is maximum if all options are NOPs or EOLs */
        struct xt_osf_opt       opt[MAX_IPOPTLEN];
};

Do we know that opt[MAX_IPOPTLEN] always start at the same offset with different architectures?

struct xt_osf_nlmsg {
        struct xt_osf_user_finger       f;
        struct iphdr            ip;
        struct tcphdr           tcp;
};
Quoted 4 lines

We do not knwo struct iphdr/tcphdr - missing include. Do we know the alignment of the above structs? Are they always the same on all archs?

If you want to fix it, then send it in different patch.

Do not mix up things, Please.

--
JSR

#4 lore raw
In reply to Sam Ravnborg
Quoted 8 lines · Sam Ravnborg

What about the other potential issues in the same file?

struct xt_osf_opt {
        __u16                   kind, length;
        struct xt_osf_wc        wc;
};

Do we know that struct xt_osf_wc is always aligned at a two byte address also on 64 bit?

Why 2 bytes? It is 4 bytes aligned everywhere everytime.

Quoted 2 lines

Do we know that sizeof(struct xt_osf_opt) is the same on all platforms?

Yes.

Quoted 15 lines
struct xt_osf_user_finger {
        struct xt_osf_wc        wss;

        __u8                    ttl, df;
        __u16                   ss, mss;
        __u16                   opt_num;

        char                    genre[MAXGENRELEN];
        char                    version[MAXGENRELEN];
        char                    subtype[MAXGENRELEN];

        /* MAX_IPOPTLEN is maximum if all options are NOPs or EOLs */
        struct xt_osf_opt       opt[MAX_IPOPTLEN];
};
Quoted 2 lines

Do we know that opt[MAX_IPOPTLEN] always start at the same offset with different architectures?

Yes.

Quoted 9 lines
struct xt_osf_nlmsg {
        struct xt_osf_user_finger       f;
        struct iphdr            ip;
        struct tcphdr           tcp;
};

We do not knwo struct iphdr/tcphdr - missing include. Do we know the alignment of the above structs? Are they always the same on all archs?

You won't believe...

Signature · 1 line
	Evgeniy Polyakov
#5 lore raw
In reply to Jaswinder Singh Rajput
Quoted 4 lines · Jaswinder Singh Rajput

fix the following 'make headers_check' warnings:

usr/include/linux/netfilter/xt_osf.h:40: found __[us]{8,16,32,64} type without #include <linux/types.h>

Applied, thanks.