#ifndef GEOIPH_H #define GEOIPH_H #include #include #include "config.h" #include "die.h" #if defined(HAVE_GEOIP) && defined(HAVE_LIBZ) extern void init_geoip(int enforce); extern void update_geoip(void); extern int geoip_working(void); extern const char *geoip4_city_name(struct sockaddr_in *sa); extern const char *geoip6_city_name(struct sockaddr_in6 *sa); extern const char *geoip4_region_name(struct sockaddr_in *sa); extern const char *geoip6_region_name(struct sockaddr_in6 *sa); extern const char *geoip4_country_name(struct sockaddr_in *sa); extern const char *geoip6_country_name(struct sockaddr_in6 *sa); extern float geoip4_longitude(struct sockaddr_in *sa); extern float geoip4_latitude(struct sockaddr_in *sa); extern float geoip6_longitude(struct sockaddr_in6 *sa); extern float geoip6_latitude(struct sockaddr_in6 *sa); extern const char *geoip4_as_name(struct sockaddr_in *sa); extern const char *geoip6_as_name(struct sockaddr_in6 *sa); extern void destroy_geoip(void); #else static inline void init_geoip(int enforce) { } static inline void destroy_geoip(void) { } static inline void update_geoip(void) { panic("No built-in geoip support!\n"); } static inline int geoip_working(void) { return 0; } static inline const char *geoip4_city_name(struct sockaddr_in *sa) { return NULL; } static inline const char *geoip6_city_name(struct sockaddr_in6 *sa) { return NULL; } static inline const char *geoip4_region_name(struct sockaddr_in *sa) { return NULL; } static inline const char *geoip6_region_name(struct sockaddr_in6 *sa) { return NULL; } static inline const char *geoip4_country_name(struct sockaddr_in *sa) { return NULL; } static inline const char *geoip6_country_name(struct sockaddr_in6 *sa) { return NULL; } static inline float geoip4_longitude(struct sockaddr_in *sa) { return .0f; } static inline float geoip4_latitude(struct sockaddr_in *sa) { return .0f; } static inline float geoip6_longitude(struct sockaddr_in6 *sa) { return .0f; } static inline float geoip6_latitude(struct sockaddr_in6 *sa) { return .0f; } static inline const char *geoip4_as_name(struct sockaddr_in *sa) { return NULL; } static inline const char *geoip6_as_name(struct sockaddr_in6 *sa) { return NULL; } #endif #endif /* GEOIPH_H */ dden' name='h' value='nds-private-remove'/>
diff options
context:
space:
mode:
authorWillem de Bruijn <willemb@google.com>2017-02-03 18:20:49 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-06 22:41:27 -0500
commit837585a5375c38d40361cfe64e6fd11e1addb936 (patch)
tree9acf1060c120551d70a9b31fc8075bf1d834eb98
parente1edab87faf6ca30cd137e0795bc73aa9a9a22ec (diff)
macvtap: read vnet_hdr_size once
When IFF_VNET_HDR is enabled, a virtio_net header must precede data. Data length is verified to be greater than or equal to expected header length tun->vnet_hdr_sz before copying. Macvtap functions read the value once, but unless READ_ONCE is used, the compiler may ignore this and read multiple times. Enforce a single read and locally cached value to avoid updates between test and use. Signed-off-by: Willem de Bruijn <willemb@google.com> Suggested-by: Eric Dumazet <edumazet@google.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/macvtap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c