netfilter: nft_osf: use NFT_OSF_MAXGENRELEN instead of IFNAMSIZ

As no "genre" on pf.os exceed 16 bytes of length, we reduce
NFT_OSF_MAXGENRELEN parameter to 16 bytes and use it instead of IFNAMSIZ.

Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
index 357862d948de1d5adc4eb644af7294dd0c248fbd..94657c701f22e86348ca4175e7233b10bdcd5cbf 100644 (file)
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
@@ -8,6 +8,7 @@
 #define NFT_SET_MAXNAMELEN     NFT_NAME_MAXLEN
 #define NFT_OBJ_MAXNAMELEN     NFT_NAME_MAXLEN
 #define NFT_USERDATA_MAXLEN    256
+#define NFT_OSF_MAXGENRELEN    16
 
 /**
  * enum nft_registers - nf_tables registers

diff --git a/net/netfilter/nft_osf.c b/net/netfilter/nft_osf.c
index 9b2f3de7be4fd0b921627cb31b7ed2e8fab0d6cb..5af74b37f4236ec0402ac41360f04a5000ae3126 100644 (file)
--- a/net/netfilter/nft_osf.c
+++ b/net/netfilter/nft_osf.c
@@ -4,8 +4,6 @@
 #include <net/netfilter/nf_tables.h>
 #include <linux/netfilter/nfnetlink_osf.h>
 
-#define OSF_GENRE_SIZE         32
-
 struct nft_osf {
        enum nft_registers      dreg:8;
 };
@@ -37,9 +35,9 @@ static void nft_osf_eval(const struct nft_expr *expr, struct nft_regs *regs,
 
        os_name = nf_osf_find(skb, nf_osf_fingers);
        if (!os_name)
-               strncpy((char *)dest, "unknown", IFNAMSIZ);
+               strncpy((char *)dest, "unknown", NFT_OSF_MAXGENRELEN);
        else
-               strncpy((char *)dest, os_name, IFNAMSIZ);
+               strncpy((char *)dest, os_name, NFT_OSF_MAXGENRELEN);
 }
 
 static int nft_osf_init(const struct nft_ctx *ctx,
@@ -51,7 +49,7 @@ static int nft_osf_init(const struct nft_ctx *ctx,
 
        priv->dreg = nft_parse_register(tb[NFTA_OSF_DREG]);
        err = nft_validate_register_store(ctx, priv->dreg, NULL,
-                                         NFTA_DATA_VALUE, OSF_GENRE_SIZE);
+                                         NFTA_DATA_VALUE, NFT_OSF_MAXGENRELEN);
        if (err < 0)
                return err;