mac80211: check PN correctly for GCMP-encrypted fragmented MPDUs

Browse source

[ Upstream commit 9acc54beb4 ]

Just like for CCMP we need to check that for GCMP the fragments
have PNs that increment by one; the spec was updated to fix this
security issue and now has the following text:

	The receiver shall discard MSDUs and MMPDUs whose constituent
	MPDU PN values are not incrementing in steps of 1.

Adapt the code for CCMP to work for GCMP as well, luckily the
relevant fields already alias each other so no code duplication
is needed (just check the aliasing with BUILD_BUG_ON.)

Cc: stable@vger.kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

...

This commit is contained in:

Johannes Berg 2016-02-26 22:13:40 +01:00 • committed by Sasha Levin

parent a60ebc3d63

commit 87e0016ccb

2 changed files with 28 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

net/mac80211/ieee80211_i.h

View file

36

net/mac80211/rx.c

View file