[PATCH] libertas: Avoid reading past end of buffer

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Kees Cook <keescook@chromium.org>
Newsgroups	linux.kernel
Subject	[PATCH] libertas: Avoid reading past end of buffer
Date	Wed, 10 May 2017 21:30:02 +0200
Message-ID	<tFFt8-4EF-3@gated-at.bofh.it> (permalink)
X-Original-To	netdev@vger.kernel.org
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=RO/S7cpwFl/adVl4GmLCzh6nrb0XQCe9R0caR/W5u18=; b=MKJFTohzkQ4jDJJY9mcHucyXQOoebn+Gw1jH0q/D7bRpFJET6oKaY4bplNsvvOLrgW 8b/gm7IFl4Q1HTD41aEg8iV9lwEoZ9YRckRvxGppoPdp1wraf2y5VcKwlcvwac16aVAW CSfiMeCHyVcfc9W/E0LejWETP3wm/O2jP/+oc=
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=RO/S7cpwFl/adVl4GmLCzh6nrb0XQCe9R0caR/W5u18=; b=Z9tmRi1OudNhcGp3R4hwmsoYXfvMG/bOxcKTRJQmTUG2IeqB7EECMvn4sJr0b5s6f3 9Tk/YCdMFy+JVCkxL3ZQ4Vt/A2fUjmmOTAvGanseKxK9c1pflAQ5ky0GynfjH/c0uM+S iK+vMgckRIeVXmmg+7Bo7T57sJk2mC1JQjwnmNR55mzx9ZjBocf2FIry8PAALAoM2tsX 76etUMCD+9osZA/ik+k498qGZvAmFwA30asEKShSI6LXV6Uq72shq2QATN/F3glAlBZ9 j5pF0WE/s4X9QEQKq4EQmZW7JhRlk7KCb5Y0JPXL+4pI4RuEBOJJWxtiJBAEj4a7gWcP Rh9w==
X-Gm-Message-State	AODbwcCqvlbe48PkX6WKTxmne9SPNC+tZ5N+0cufzW+4A7oJ0zuFVOKf M4gn+3/BIyit1W7r
X-Received	by 10.84.197.1 with SMTP id m1mr10341164pld.183.1494444293390; Wed, 10 May 2017 12:24:53 -0700 (PDT)
MIME-Version	1.0
Content-Type	text/plain; charset=us-ascii
Content-Disposition	inline
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	72
Organization	linux.* mail to news gateway
X-Original-Cc	Joe Perches <joe@perches.com>, Kalle Valo <kvalo@codeaurora.org>, libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org, Daniel Micay <danielmicay@gmail.com>, linux-kernel@vger.kernel.org
X-Original-Date	Wed, 10 May 2017 12:24:51 -0700
X-Original-Message-ID	<20170510192451.GA115771@beast>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1639049

Show key headers only | View raw

Using memcpy() from a string that is shorter than the length copied means
the destination buffer is being filled with arbitrary data from the kernel
rodata segment. Instead, redefine the stat strings to be ETH_GSTRING_LEN
sizes, like other drivers. This lets us use a single memcpy that does not
leak rodata contents. Additionally adjust indentation to keep checkpatch.pl
happy.

This was found with the future CONFIG_FORTIFY_SOURCE feature.

Cc: Daniel Micay <danielmicay@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
v2: use ETH_GSTRING_LEN; joe
---
 drivers/net/wireless/marvell/libertas/mesh.c | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/drivers/net/wireless/marvell/libertas/mesh.c b/drivers/net/wireless/marvell/libertas/mesh.c
index d0c881dd5846..6076c83ce5ab 100644
--- a/drivers/net/wireless/marvell/libertas/mesh.c
+++ b/drivers/net/wireless/marvell/libertas/mesh.c
@@ -1108,15 +1108,15 @@ void lbs_mesh_set_txpd(struct lbs_private *priv,
  * Ethtool related
  */
 
-static const char * const mesh_stat_strings[] = {
-			"drop_duplicate_bcast",
-			"drop_ttl_zero",
-			"drop_no_fwd_route",
-			"drop_no_buffers",
-			"fwded_unicast_cnt",
-			"fwded_bcast_cnt",
-			"drop_blind_table",
-			"tx_failed_cnt"
+static const char mesh_stat_strings[MESH_STATS_NUM][ETH_GSTRING_LEN] = {
+	"drop_duplicate_bcast",
+	"drop_ttl_zero",
+	"drop_no_fwd_route",
+	"drop_no_buffers",
+	"fwded_unicast_cnt",
+	"fwded_bcast_cnt",
+	"drop_blind_table",
+	"tx_failed_cnt"
 };
 
 void lbs_mesh_ethtool_get_stats(struct net_device *dev,
@@ -1170,17 +1170,11 @@ int lbs_mesh_ethtool_get_sset_count(struct net_device *dev, int sset)
 void lbs_mesh_ethtool_get_strings(struct net_device *dev,
 	uint32_t stringset, uint8_t *s)
 {
-	int i;
-
 	lbs_deb_enter(LBS_DEB_ETHTOOL);
 
 	switch (stringset) {
 	case ETH_SS_STATS:
-		for (i = 0; i < MESH_STATS_NUM; i++) {
-			memcpy(s + i * ETH_GSTRING_LEN,
-					mesh_stat_strings[i],
-					ETH_GSTRING_LEN);
-		}
+		memcpy(s, *mesh_stat_strings, sizeof(mesh_stat_strings));
 		break;
 	}
 	lbs_deb_enter(LBS_DEB_ETHTOOL);
-- 
2.7.4


-- 
Kees Cook
Pixel Security

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] libertas: Avoid reading past end of buffer Kees Cook <keescook@chromium.org> - 2017-05-10 21:30 +0200
  Re: [PATCH] libertas: Avoid reading past end of buffer Joe Perches <joe@perches.com> - 2017-05-11 01:10 +0200
    Re: [PATCH] libertas: Avoid reading past end of buffer Kalle Valo <kvalo@codeaurora.org> - 2017-05-11 05:50 +0200
  Re: [PATCH] libertas: Avoid reading past end of buffer Joe Perches <joe@perches.com> - 2017-05-11 01:20 +0200

csiph-web