On 07/09/2012 14:05, Johannes Berg wrote: > On Fri, 2012-09-07 at 14:01 +0200, Nicolas Cavallari wrote: > >>>> Or just never set TX_INTFL_DONT_ENCRYPT at all and rely on >>>> ieee80211_tx_h_select_key() to do the right thing ? >>> >>> I don't think it can do the right thing, it doesn't check whether MFP is >>> enabled or not... >> >> It does; The first part try to encrypt everything, the second part >> disable encryption if ccmp is selected and !ieee80211_is_data_present && >> !ieee80211_use_mfp, >> which test, among other things, for the sta's WLAN_STA_MFP flag if sta >> != null. > > Good point. > >> If tx_h_select_key does not select the right key in this case, i think >> we have bigger problems. > > Maybe, maybe not. But it looks like it would be safe. > >>> unless you want to test all those cases I'd rather not >>> change it :) >> >> Not worth the trouble in this case, but i think there is too much code >> that sets TX_INTFL_DONT_ENCRYPT when it shouldn't. > > I already applied the v3 patchset, but even if I hadn't I'd say it > should be a separate patch(set), want to send some patches to remove > them? :) I'll do that later, along with some other 802.11 2012 crypto work. -- 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
