D24562.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D24562.diff
View Options

	Index: head/sys/net80211/ieee80211_mesh.c
	===================================================================
	--- head/sys/net80211/ieee80211_mesh.c
	+++ head/sys/net80211/ieee80211_mesh.c
	@@ -3575,16 +3575,21 @@
	ieee80211_mesh_rt_flush(vap);
	break;
	case IEEE80211_MESH_RTCMD_ADD:
	- if (IEEE80211_ADDR_EQ(vap->iv_myaddr, ireq->i_data) \|\|
	- IEEE80211_ADDR_EQ(broadcastaddr, ireq->i_data))
	- return EINVAL;
	- error = copyin(ireq->i_data, &tmpaddr,
	+ error = copyin(ireq->i_data, tmpaddr,
	IEEE80211_ADDR_LEN);
	- if (error == 0)
	- ieee80211_mesh_discover(vap, tmpaddr, NULL);
	+ if (error != 0)
	+ break;
	+ if (IEEE80211_ADDR_EQ(vap->iv_myaddr, tmpaddr) \|\|
	+ IEEE80211_ADDR_EQ(broadcastaddr, tmpaddr))
	+ return EINVAL;
	+ ieee80211_mesh_discover(vap, tmpaddr, NULL);
	break;
	case IEEE80211_MESH_RTCMD_DELETE:
	- ieee80211_mesh_rt_del(vap, ireq->i_data);
	+ error = copyin(ireq->i_data, tmpaddr,
	+ IEEE80211_ADDR_LEN);
	+ if (error != 0)
	+ break;
	+ ieee80211_mesh_rt_del(vap, tmpaddr);
	break;
	default:
	return ENOSYS;