Merge branch 'for-3.11/CVE-2013-2888' into for-3.12/upstream

This one didn't make it for 3.11 due to being applied too close
to release, queue it for 3.12 merge window.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>