提交 a25bab9d 编写于 作者: S Sven Eckelmann 提交者: Simon Wunderlich

batman-adv: Fix segfault when writing to sysfs elp_interval

The per hardif sysfs file "batman_adv/elp_interval" is using the generic
functions to store/show uint values. The helper __batadv_store_uint_attr
requires the softif net_device as parameter to print the resulting change
as info text when the users writes to this file. It uses the helper
function batadv_info to add it at the same time to the kernel ring buffer
and to the batman-adv debug log (when CONFIG_BATMAN_ADV_DEBUG is enabled).

The function batadv_info requires as first parameter the batman-adv softif
net_device. This parameter is then used to find the private buffer which
contains the debug log for this batman-adv interface. But
batadv_store_throughput_override used as first argument the slave
net_device. This slave device doesn't have the batadv_priv private data
which is access by batadv_info.

Writing to this file with CONFIG_BATMAN_ADV_DEBUG enabled can either lead
to a segfault or to memory corruption.

Fixes: 0744ff8f ("batman-adv: Add hard_iface specific sysfs wrapper macros for UINT")
Signed-off-by: NSven Eckelmann <sven@narfation.org>
Acked-by: NMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: NSimon Wunderlich <sw@simonwunderlich.de>
上级 b9fd14c2
...@@ -188,7 +188,8 @@ ssize_t batadv_store_##_name(struct kobject *kobj, \ ...@@ -188,7 +188,8 @@ ssize_t batadv_store_##_name(struct kobject *kobj, \
\ \
return __batadv_store_uint_attr(buff, count, _min, _max, \ return __batadv_store_uint_attr(buff, count, _min, _max, \
_post_func, attr, \ _post_func, attr, \
&bat_priv->_var, net_dev); \ &bat_priv->_var, net_dev, \
NULL); \
} }
#define BATADV_ATTR_SIF_SHOW_UINT(_name, _var) \ #define BATADV_ATTR_SIF_SHOW_UINT(_name, _var) \
...@@ -262,7 +263,9 @@ ssize_t batadv_store_##_name(struct kobject *kobj, \ ...@@ -262,7 +263,9 @@ ssize_t batadv_store_##_name(struct kobject *kobj, \
\ \
length = __batadv_store_uint_attr(buff, count, _min, _max, \ length = __batadv_store_uint_attr(buff, count, _min, _max, \
_post_func, attr, \ _post_func, attr, \
&hard_iface->_var, net_dev); \ &hard_iface->_var, \
hard_iface->soft_iface, \
net_dev); \
\ \
batadv_hardif_put(hard_iface); \ batadv_hardif_put(hard_iface); \
return length; \ return length; \
...@@ -356,10 +359,12 @@ __batadv_store_bool_attr(char *buff, size_t count, ...@@ -356,10 +359,12 @@ __batadv_store_bool_attr(char *buff, size_t count,
static int batadv_store_uint_attr(const char *buff, size_t count, static int batadv_store_uint_attr(const char *buff, size_t count,
struct net_device *net_dev, struct net_device *net_dev,
struct net_device *slave_dev,
const char *attr_name, const char *attr_name,
unsigned int min, unsigned int max, unsigned int min, unsigned int max,
atomic_t *attr) atomic_t *attr)
{ {
char ifname[IFNAMSIZ + 3] = "";
unsigned long uint_val; unsigned long uint_val;
int ret; int ret;
...@@ -385,8 +390,11 @@ static int batadv_store_uint_attr(const char *buff, size_t count, ...@@ -385,8 +390,11 @@ static int batadv_store_uint_attr(const char *buff, size_t count,
if (atomic_read(attr) == uint_val) if (atomic_read(attr) == uint_val)
return count; return count;
batadv_info(net_dev, "%s: Changing from: %i to: %lu\n", if (slave_dev)
attr_name, atomic_read(attr), uint_val); snprintf(ifname, sizeof(ifname), "%s: ", slave_dev->name);
batadv_info(net_dev, "%s: %sChanging from: %i to: %lu\n",
attr_name, ifname, atomic_read(attr), uint_val);
atomic_set(attr, uint_val); atomic_set(attr, uint_val);
return count; return count;
...@@ -397,12 +405,13 @@ static ssize_t __batadv_store_uint_attr(const char *buff, size_t count, ...@@ -397,12 +405,13 @@ static ssize_t __batadv_store_uint_attr(const char *buff, size_t count,
void (*post_func)(struct net_device *), void (*post_func)(struct net_device *),
const struct attribute *attr, const struct attribute *attr,
atomic_t *attr_store, atomic_t *attr_store,
struct net_device *net_dev) struct net_device *net_dev,
struct net_device *slave_dev)
{ {
int ret; int ret;
ret = batadv_store_uint_attr(buff, count, net_dev, attr->name, min, max, ret = batadv_store_uint_attr(buff, count, net_dev, slave_dev,
attr_store); attr->name, min, max, attr_store);
if (post_func && ret) if (post_func && ret)
post_func(net_dev); post_func(net_dev);
...@@ -571,7 +580,7 @@ static ssize_t batadv_store_gw_sel_class(struct kobject *kobj, ...@@ -571,7 +580,7 @@ static ssize_t batadv_store_gw_sel_class(struct kobject *kobj,
return __batadv_store_uint_attr(buff, count, 1, BATADV_TQ_MAX_VALUE, return __batadv_store_uint_attr(buff, count, 1, BATADV_TQ_MAX_VALUE,
batadv_post_gw_reselect, attr, batadv_post_gw_reselect, attr,
&bat_priv->gw.sel_class, &bat_priv->gw.sel_class,
bat_priv->soft_iface); bat_priv->soft_iface, NULL);
} }
static ssize_t batadv_show_gw_bwidth(struct kobject *kobj, static ssize_t batadv_show_gw_bwidth(struct kobject *kobj,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册