From: Simon Wunderlich <sw@simonwunderlich.de>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
Sven Eckelmann <sven@narfation.org>,
Simon Wunderlich <sw@simonwunderlich.de>
Subject: [B.A.T.M.A.N.] [PATCH 02/11] batman-adv: Fix segfault when writing to throughput_override
Date: Wed, 19 Sep 2018 14:22:04 +0200 [thread overview]
Message-ID: <20180919122213.23108-3-sw@simonwunderlich.de> (raw)
In-Reply-To: <20180919122213.23108-1-sw@simonwunderlich.de>
From: Sven Eckelmann <sven@narfation.org>
The per hardif sysfs file "batman_adv/throughput_override" prints 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: 0b5ecc6811bd ("batman-adv: add throughput override attribute to hard_ifaces")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Acked-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
---
net/batman-adv/sysfs.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c
index f2eef43bd2ec..3a76e8970c02 100644
--- a/net/batman-adv/sysfs.c
+++ b/net/batman-adv/sysfs.c
@@ -1090,8 +1090,9 @@ static ssize_t batadv_store_throughput_override(struct kobject *kobj,
if (old_tp_override == tp_override)
goto out;
- batadv_info(net_dev, "%s: Changing from: %u.%u MBit to: %u.%u MBit\n",
- "throughput_override",
+ batadv_info(hard_iface->soft_iface,
+ "%s: %s: Changing from: %u.%u MBit to: %u.%u MBit\n",
+ "throughput_override", net_dev->name,
old_tp_override / 10, old_tp_override % 10,
tp_override / 10, tp_override % 10);
--
2.11.0
next prev parent reply other threads:[~2018-09-19 12:22 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-19 12:22 [B.A.T.M.A.N.] [PATCH 00/11] pull request for net: batman-adv 2018-09-19 Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 01/11] batman-adv: Avoid probe ELP information leak Simon Wunderlich
2018-09-19 12:22 ` Simon Wunderlich [this message]
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 03/11] batman-adv: Fix segfault when writing to sysfs elp_interval Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 04/11] batman-adv: Prevent duplicated gateway_node entry Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 05/11] batman-adv: Prevent duplicated nc_node entry Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 06/11] batman-adv: Prevent duplicated softif_vlan entry Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 07/11] batman-adv: Prevent duplicated global TT entry Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 08/11] batman-adv: Prevent duplicated tvlv handler Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 09/11] batman-adv: fix backbone_gw refcount on queue_work() failure Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 10/11] batman-adv: fix hardif_neigh " Simon Wunderlich
2018-09-19 12:22 ` [B.A.T.M.A.N.] [PATCH 11/11] batman-adv: Increase version number to 2018.3 Simon Wunderlich
2018-09-20 3:34 ` [B.A.T.M.A.N.] [PATCH 00/11] pull request for net: batman-adv 2018-09-19 David Miller
2018-09-20 8:09 ` Simon Wunderlich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180919122213.23108-3-sw@simonwunderlich.de \
--to=sw@simonwunderlich.de \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=sven@narfation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).