libertas: Avoid reading past end of buffer
Subsystems (3)
PATCH 1/1 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.
---
v2: use ETH_GSTRING_LEN; joe
--- drivers/net/wireless/marvell/libertas/mesh.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-)
drivers/net/wireless/marvell/libertas/mesh.c +10 -16
@@ -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 );
Signature · 6 lines
2.7.4 -- Kees Cook Pixel Security
Quoted 1 line · Kees Cook
Using
memcpy()from a string that is shorter than the length copied means
[]
drivers/net/wireless/marvell/libertas/mesh.c
Quoted 1 line
drivers/net/wireless/marvell/libertas/mesh.c +0
-0
[]
Quoted 9 lines
drivers/net/wireless/marvell/libertas/mesh.c +0
-2@@ -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) {
drivers/net/wireless/marvell/libertas/mesh.c int lbs_mesh_ethtool_get_sset_count(struct net_device *dev, int sset) · line 1180
Quoted 10 lines
drivers/net/wireless/marvell/libertas/mesh.c +1
-5case 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 );
unrelated trivia:
lbs_deb_enter is used incorrectly here at
function exit as both enter and leave calls.
That type of copy/paste defect may be common.
$ git grep -w lbs_deb_enter | wc -l 148 $ git grep -w lbs_deb_leave | wc -l 71
One would expect these numbers to be the same.
Another option would be to delete all these
calls as ftrace function tracing works well.
Quoted 3 lines · Kees Cook
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.
another bit of trivia:
drivers/net/wireless/marvell/libertas/mesh.c
Quoted 1 line
drivers/net/wireless/marvell/libertas/mesh.c +0
-0
[]
drivers/net/wireless/marvell/libertas/mesh.c int lbs_mesh_ethtool_get_sset_count(struct net_device *dev, int sset)
Quoted 1 line
drivers/net/wireless/marvell/libertas/mesh.c +0
-0@@ -1170,17 +1170,11 @@ int lbs_mesh_ethtool_get_sset_count(struct net_device *dev, int sset)
[]
drivers/net/wireless/marvell/libertas/mesh.c int lbs_mesh_ethtool_get_sset_count(struct net_device *dev, int sset) · line 1177
Quoted 1 line
drivers/net/wireless/marvell/libertas/mesh.c +1
-0+memcpy (s, *mesh_stat_strings,sizeof (mesh_stat_strings));
That * isn't necessary.
Quoted 12 lines · Joe Perches
unrelated trivia:
lbs_deb_enteris used incorrectly here at
function exit as both enter and leave calls.That type of copy/paste defect may be common.
$ git grep -w lbs_deb_enter | wc -l 148 $ git grep -w lbs_deb_leave | wc -l 71
Quoted 4 lines
One would expect these numbers to be the same.
Another option would be to delete all these
calls as ftrace function tracing works well.
Yeah, deleting all the enter/exit calls would be better.
Signature · 1 line
Kalle Valo