On Thu, Feb 14, 2013 at 3:51 PM, Johannes Berg
<johannes@xxxxxxxxxxxxxxxx> wrote:
> On Thu, 2013-02-14 at 14:52 -0800, Thomas Pedersen wrote:
>> On Thu, Feb 14, 2013 at 2:37 PM, Johannes Berg
>> <johannes@xxxxxxxxxxxxxxxx> wrote:
>> > From: Johannes Berg <johannes.berg@xxxxxxxxx>
>> >
>> > Make the ability to leave the plink_state unchanged not use a
>> > magic -1 variable that isn't in the enum, but an explicit change
>> > flag; reject invalid plink states or actions and move the needed
>> > constants for plink actions to the right header file. Also
>> > reject plink_state changes for non-mesh interfaces.
>> >
>> > Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
>>
>> > diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
>> > index 909053a..8e1a03e 100644
>> > --- a/net/mac80211/cfg.c
>> > +++ b/net/mac80211/cfg.c
>> > @@ -1261,7 +1261,9 @@ static int sta_apply_parameters(struct ieee80211_local *local,
>> > if (ieee80211_vif_is_mesh(&sdata->vif)) {
>> > #ifdef CONFIG_MAC80211_MESH
>> > u32 changed = 0;
>> > - if (sdata->u.mesh.security & IEEE80211_MESH_SEC_SECURED) {
>> > + if (sdata->u.mesh.security & IEEE80211_MESH_SEC_SECURED &&
>> > + (params->sta_modify_mask &
>> > + STATION_PARAM_APPLY_PLINK_STATE)) {
>> > switch (params->plink_state) {
>> > case NL80211_PLINK_ESTAB:
>> > if (sta->plink_state != NL80211_PLINK_ESTAB)
>> > @@ -1292,12 +1294,18 @@ static int sta_apply_parameters(struct ieee80211_local *local,
>> > /* nothing */
>> > break;
>> > }
>> > + } else if (params->sta_modify_mask &
>> > + STATION_PARAM_APPLY_PLINK_STATE) {
>> > + return -EINVAL;
>>
>> It would make sense to disallow setting plink_action if MPM is in userspace.
>
> I'm not sure what you mean?
if mesh security is on (i.e. MPM lives in userspace), the kernel MPM
won't be running and therefore the user shouldn't be able to initiate
a plink_action. The way you have it now is
if (mesh_is_secure && sta_modify_mask & PLINK_STATE)
... set state ...
else if (sta_modify_mask & PLINK_STATE)
-EINVAL
} else
... do plink_action ...
the case
if (mesh_is_secure && sta_modify_mask & PLINK_ACTION)
should return an -EINVAL as well.
--
Thomas
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
