diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2016-05-01 18:00:43 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-06-15 21:29:20 +0100 |
| commit | f58a6c08ebdfa978178bbca78c2ba744a2665912 (patch) | |
| tree | 3f682cf73c2df446fff417fad77104686d1f2b5b /include | |
| parent | 8547d08f56fb267be3a7e07d029d1db920073811 (diff) | |
Revert "net: validate variable length ll headers"
This reverts commit 2793a23aacbd754dbbb5cb75093deb7e4103bace, which was
commit 2793a23aacbd754dbbb5cb75093deb7e4103bace upstream. It is
pointless unless af_packet calls the new function.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netdevice.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index bfc3f9dfd928..b3404718fda1 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -262,7 +262,6 @@ struct header_ops { void (*cache_update)(struct hh_cache *hh, const struct net_device *dev, const unsigned char *haddr); - bool (*validate)(const char *ll_header, unsigned int len); }; /* These flag bits are private to the generic network queueing @@ -1348,7 +1347,7 @@ struct net_device { unsigned int mtu; /* interface MTU value */ unsigned short type; /* interface hardware type */ - unsigned short hard_header_len; /* maximum hardware hdr length */ + unsigned short hard_header_len; /* hardware hdr length */ /* extra head- and tailroom the hardware may need, but not in all cases * can this be guaranteed, especially tailroom. Some cases also use @@ -2072,24 +2071,6 @@ static inline int dev_rebuild_header(struct sk_buff *skb) return dev->header_ops->rebuild(skb); } -/* ll_header must have at least hard_header_len allocated */ -static inline bool dev_validate_header(const struct net_device *dev, - char *ll_header, int len) -{ - if (likely(len >= dev->hard_header_len)) - return true; - - if (capable(CAP_SYS_RAWIO)) { - memset(ll_header + len, 0, dev->hard_header_len - len); - return true; - } - - if (dev->header_ops && dev->header_ops->validate) - return dev->header_ops->validate(ll_header, len); - - return false; -} - typedef int gifconf_func_t(struct net_device * dev, char __user * bufptr, int len); int register_gifconf(unsigned int family, gifconf_func_t *gifconf); static inline int unregister_gifconf(unsigned int family) |