flow_dissector: constify raw input data argument

Flow Dissector code never modifies the input buffer, neither skb nor
raw data.
Make 'data' argument const for all of the Flow dissector's functions.

Signed-off-by: Alexander Lobakin <alobakin@pm.me>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index d6ea3dc3eddb2793d51530230f89faa7feacff58..46c61e127e9f127ed42e5062e19ff1ba86181570 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1292,10 +1292,10 @@ __skb_set_sw_hash(struct sk_buff *skb, __u32 hash, bool is_l4)
 void __skb_get_hash(struct sk_buff *skb);
 u32 __skb_get_hash_symmetric(const struct sk_buff *skb);
 u32 skb_get_poff(const struct sk_buff *skb);
-u32 __skb_get_poff(const struct sk_buff *skb, void *data,
+u32 __skb_get_poff(const struct sk_buff *skb, const void *data,
                   const struct flow_keys_basic *keys, int hlen);
 __be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,
-                           void *data, int hlen_proto);
+                           const void *data, int hlen_proto);
 
 static inline __be32 skb_flow_get_ports(const struct sk_buff *skb,
                                        int thoff, u8 ip_proto)
@@ -1314,9 +1314,8 @@ bool bpf_flow_dissect(struct bpf_prog *prog, struct bpf_flow_dissector *ctx,
 bool __skb_flow_dissect(const struct net *net,
                        const struct sk_buff *skb,
                        struct flow_dissector *flow_dissector,
-                       void *target_container,
-                       void *data, __be16 proto, int nhoff, int hlen,
-                       unsigned int flags);
+                       void *target_container, const void *data,
+                       __be16 proto, int nhoff, int hlen, unsigned int flags);
 
 static inline bool skb_flow_dissect(const struct sk_buff *skb,
                                    struct flow_dissector *flow_dissector,
@@ -1338,9 +1337,9 @@ static inline bool skb_flow_dissect_flow_keys(const struct sk_buff *skb,
 static inline bool
 skb_flow_dissect_flow_keys_basic(const struct net *net,
                                 const struct sk_buff *skb,
-                                struct flow_keys_basic *flow, void *data,
-                                __be16 proto, int nhoff, int hlen,
-                                unsigned int flags)
+                                struct flow_keys_basic *flow,
+                                const void *data, __be16 proto,
+                                int nhoff, int hlen, unsigned int flags)
 {
        memset(flow, 0, sizeof(*flow));
        return __skb_flow_dissect(net, skb, &flow_keys_basic_dissector, flow,

diff --git a/include/net/flow_dissector.h b/include/net/flow_dissector.h
index bf00e71816ed04f01d20dcbf4e87667490cc95e9..ffd386ea0dbb3ea96d2d484bb25bf47cd7a70aa3 100644 (file)
--- a/include/net/flow_dissector.h
+++ b/include/net/flow_dissector.h
@@ -350,7 +350,7 @@ static inline bool flow_keys_have_l4(const struct flow_keys *keys)
 u32 flow_hash_from_keys(struct flow_keys *keys);
 void skb_flow_get_icmp_tci(const struct sk_buff *skb,
                           struct flow_dissector_key_icmp *key_icmp,
-                          void *data, int thoff, int hlen);
+                          const void *data, int thoff, int hlen);
 
 static inline bool dissector_uses_key(const struct flow_dissector *flow_dissector,
                                      enum flow_dissector_key_id key_id)

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 2ef2224b3bff784dc5d8edbe110cc0b08096ee78..2ed380d096ce0206f5a7ce42733f1bed10019e53 100644 (file)
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -114,7 +114,7 @@ int flow_dissector_bpf_prog_attach_check(struct net *net,
  * is the protocol port offset returned from proto_ports_offset
  */
 __be32 __skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto,
-                           void *data, int hlen)
+                           const void *data, int hlen)
 {
        int poff = proto_ports_offset(ip_proto);
 
@@ -161,7 +161,7 @@ static bool icmp_has_id(u8 type)
  */
 void skb_flow_get_icmp_tci(const struct sk_buff *skb,
                           struct flow_dissector_key_icmp *key_icmp,
-                          void *data, int thoff, int hlen)
+                          const void *data, int thoff, int hlen)
 {
        struct icmphdr *ih, _ih;
 
@@ -187,8 +187,8 @@ EXPORT_SYMBOL(skb_flow_get_icmp_tci);
  */
 static void __skb_flow_dissect_icmp(const struct sk_buff *skb,
                                    struct flow_dissector *flow_dissector,
-                                   void *target_container,
-                                   void *data, int thoff, int hlen)
+                                   void *target_container, const void *data,
+                                   int thoff, int hlen)
 {
        struct flow_dissector_key_icmp *key_icmp;
 
@@ -409,8 +409,8 @@ EXPORT_SYMBOL(skb_flow_dissect_hash);
 static enum flow_dissect_ret
 __skb_flow_dissect_mpls(const struct sk_buff *skb,
                        struct flow_dissector *flow_dissector,
-                       void *target_container, void *data, int nhoff, int hlen,
-                       int lse_index, bool *entropy_label)
+                       void *target_container, const void *data, int nhoff,
+                       int hlen, int lse_index, bool *entropy_label)
 {
        struct mpls_label *hdr, _hdr;
        u32 entry, label, bos;
@@ -467,7 +467,8 @@ __skb_flow_dissect_mpls(const struct sk_buff *skb,
 static enum flow_dissect_ret
 __skb_flow_dissect_arp(const struct sk_buff *skb,
                       struct flow_dissector *flow_dissector,
-                      void *target_container, void *data, int nhoff, int hlen)
+                      void *target_container, const void *data,
+                      int nhoff, int hlen)
 {
        struct flow_dissector_key_arp *key_arp;
        struct {
@@ -523,7 +524,7 @@ static enum flow_dissect_ret
 __skb_flow_dissect_gre(const struct sk_buff *skb,
                       struct flow_dissector_key_control *key_control,
                       struct flow_dissector *flow_dissector,
-                      void *target_container, void *data,
+                      void *target_container, const void *data,
                       __be16 *p_proto, int *p_nhoff, int *p_hlen,
                       unsigned int flags)
 {
@@ -663,8 +664,8 @@ __skb_flow_dissect_gre(const struct sk_buff *skb,
 static enum flow_dissect_ret
 __skb_flow_dissect_batadv(const struct sk_buff *skb,
                          struct flow_dissector_key_control *key_control,
-                         void *data, __be16 *p_proto, int *p_nhoff, int hlen,
-                         unsigned int flags)
+                         const void *data, __be16 *p_proto, int *p_nhoff,
+                         int hlen, unsigned int flags)
 {
        struct {
                struct batadv_unicast_packet batadv_unicast;
@@ -695,7 +696,8 @@ __skb_flow_dissect_batadv(const struct sk_buff *skb,
 static void
 __skb_flow_dissect_tcp(const struct sk_buff *skb,
                       struct flow_dissector *flow_dissector,
-                      void *target_container, void *data, int thoff, int hlen)
+                      void *target_container, const void *data,
+                      int thoff, int hlen)
 {
        struct flow_dissector_key_tcp *key_tcp;
        struct tcphdr *th, _th;
@@ -719,8 +721,8 @@ __skb_flow_dissect_tcp(const struct sk_buff *skb,
 static void
 __skb_flow_dissect_ports(const struct sk_buff *skb,
                         struct flow_dissector *flow_dissector,
-                        void *target_container, void *data, int nhoff,
-                        u8 ip_proto, int hlen)
+                        void *target_container, const void *data,
+                        int nhoff, u8 ip_proto, int hlen)
 {
        enum flow_dissector_key_id dissector_ports = FLOW_DISSECTOR_KEY_MAX;
        struct flow_dissector_key_ports *key_ports;
@@ -744,7 +746,8 @@ __skb_flow_dissect_ports(const struct sk_buff *skb,
 static void
 __skb_flow_dissect_ipv4(const struct sk_buff *skb,
                        struct flow_dissector *flow_dissector,
-                       void *target_container, void *data, const struct iphdr *iph)
+                       void *target_container, const void *data,
+                       const struct iphdr *iph)
 {
        struct flow_dissector_key_ip *key_ip;
 
@@ -761,7 +764,8 @@ __skb_flow_dissect_ipv4(const struct sk_buff *skb,
 static void
 __skb_flow_dissect_ipv6(const struct sk_buff *skb,
                        struct flow_dissector *flow_dissector,
-                       void *target_container, void *data, const struct ipv6hdr *iph)
+                       void *target_container, const void *data,
+                       const struct ipv6hdr *iph)
 {
        struct flow_dissector_key_ip *key_ip;
 
@@ -908,9 +912,8 @@ bool bpf_flow_dissect(struct bpf_prog *prog, struct bpf_flow_dissector *ctx,
 bool __skb_flow_dissect(const struct net *net,
                        const struct sk_buff *skb,
                        struct flow_dissector *flow_dissector,
-                       void *target_container,
-                       void *data, __be16 proto, int nhoff, int hlen,
-                       unsigned int flags)
+                       void *target_container, const void *data,
+                       __be16 proto, int nhoff, int hlen, unsigned int flags)
 {
        struct flow_dissector_key_control *key_control;
        struct flow_dissector_key_basic *key_basic;
@@ -1642,7 +1645,7 @@ __u32 skb_get_hash_perturb(const struct sk_buff *skb,
 }
 EXPORT_SYMBOL(skb_get_hash_perturb);
 
-u32 __skb_get_poff(const struct sk_buff *skb, void *data,
+u32 __skb_get_poff(const struct sk_buff *skb, const void *data,
                   const struct flow_keys_basic *keys, int hlen)
 {
        u32 poff = keys->control.thoff;