Commit 12e3c043 authored by Kees Cook's avatar Kees Cook Committed by Kalle Valo

libertas: Avoid reading past end of buffer

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: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 438f3d13
...@@ -1108,15 +1108,15 @@ void lbs_mesh_set_txpd(struct lbs_private *priv, ...@@ -1108,15 +1108,15 @@ void lbs_mesh_set_txpd(struct lbs_private *priv,
* Ethtool related * Ethtool related
*/ */
static const char * const mesh_stat_strings[] = { static const char mesh_stat_strings[MESH_STATS_NUM][ETH_GSTRING_LEN] = {
"drop_duplicate_bcast", "drop_duplicate_bcast",
"drop_ttl_zero", "drop_ttl_zero",
"drop_no_fwd_route", "drop_no_fwd_route",
"drop_no_buffers", "drop_no_buffers",
"fwded_unicast_cnt", "fwded_unicast_cnt",
"fwded_bcast_cnt", "fwded_bcast_cnt",
"drop_blind_table", "drop_blind_table",
"tx_failed_cnt" "tx_failed_cnt"
}; };
void lbs_mesh_ethtool_get_stats(struct net_device *dev, 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) ...@@ -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, void lbs_mesh_ethtool_get_strings(struct net_device *dev,
uint32_t stringset, uint8_t *s) uint32_t stringset, uint8_t *s)
{ {
int i;
lbs_deb_enter(LBS_DEB_ETHTOOL); lbs_deb_enter(LBS_DEB_ETHTOOL);
switch (stringset) { switch (stringset) {
case ETH_SS_STATS: case ETH_SS_STATS:
for (i = 0; i < MESH_STATS_NUM; i++) { memcpy(s, mesh_stat_strings, sizeof(mesh_stat_strings));
memcpy(s + i * ETH_GSTRING_LEN,
mesh_stat_strings[i],
ETH_GSTRING_LEN);
}
break; break;
} }
lbs_deb_enter(LBS_DEB_ETHTOOL); lbs_deb_enter(LBS_DEB_ETHTOOL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment