libertas: Avoid reading past end of buffer (12e3c043) · Commits · 戴 / test

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> Signed-off-by:

Kalle Valo <kvalo@codeaurora.org>

drivers/net/wireless/marvell/libertas/mesh.c

+10 −16

Original line number	Diff line number	Diff line
		@@ -1108,7 +1108,7 @@ void lbs_mesh_set_txpd(struct lbs_private *priv,
		* 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_ttl_zero",
		"drop_no_fwd_route",
		@@ -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);

Admin message