CL:479577

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/f3e4b0af0b969fda15cb6e8294602fac15aa18d7

commit f3e4b0af0b969fda15cb6e8294602fac15aa18d7
Author: Guenter Roeck <groeck@chromium.org>
Date: Mon Apr 17 21:06:21 2017

CHROMIUM: ext4: Remove broken support for detecting keyring key revocation

Per upstream commit 1b53cf9815bb ("fscrypt: remove broken support for detecting
keyring key revocation"), keyring revocation detection is broken, and the
underlying code has been removed in v4.4.61. Remove local code to avoid build
breakage after the merge.

BUG= chromium:711780 
TEST=Build after merge

Change-Id: I2bac509fa87ece8ddff7cd01a24ac71134045236
Signed-off-by: Guenter Roeck <groeck@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/479576
Reviewed-by: Dmitry Torokhov <dtor@chromium.org>

[modify] https://crrev.com/f3e4b0af0b969fda15cb6e8294602fac15aa18d7/fs/ext4/crypto.c

Merging 4.4.64 instead of 4.4.62 to catch CVE-2017-7889 and possibly others.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/d60d5e5e785c0bf47a1fe68f0ef6343cacbc64da

commit d60d5e5e785c0bf47a1fe68f0ef6343cacbc64da
Author: Guenter Roeck <groeck@chromium.org>
Date: Tue May 02 16:06:49 2017

CHROMIUM: Merge tag 'v4.4.64' into chromeos-4.4

Merge of v4.4.64 into chromeos-4.4

The following patch has been reverted from v4.4.64 prior to the merge
since the removed code is used by Lakitu.

	0c0be310ba29 netlink: remove mmapped netlink support

Conflicts:
	net/wireless/nl80211.c
	fs/namespace.c
	drivers/usb/host/xhci-plat.c
	drivers/usb/dwc3/gadget.c
	drivers/char/tpm/tpm_tis.c
	drivers/gpu/drm/i915/intel_pm.c

BUG= chromium:711780 
TEST=Build and test on Kevin, Gru, Reef, Chell with 4.4 kernel

Change-Id: I8546b27eddb9937709bfc508daacf5e4b87b8603
Signed-off-by: Guenter Roeck <groeck@chromium.org>

[modify] https://crrev.com/d60d5e5e785c0bf47a1fe68f0ef6343cacbc64da/fs/namespace.c
[modify] https://crrev.com/d60d5e5e785c0bf47a1fe68f0ef6343cacbc64da/drivers/char/tpm/tpm_tis.c
[modify] https://crrev.com/d60d5e5e785c0bf47a1fe68f0ef6343cacbc64da/net/wireless/nl80211.c
[modify] https://crrev.com/d60d5e5e785c0bf47a1fe68f0ef6343cacbc64da/drivers/gpu/drm/i915/intel_pm.c
[modify] https://crrev.com/d60d5e5e785c0bf47a1fe68f0ef6343cacbc64da/drivers/usb/dwc3/gadget.c
[modify] https://crrev.com/d60d5e5e785c0bf47a1fe68f0ef6343cacbc64da/drivers/usb/host/xhci-plat.c

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/88e2cf81a7124331dea975f53b73d7a393e8d78d

commit 88e2cf81a7124331dea975f53b73d7a393e8d78d
Author: Guenter Roeck <groeck@chromium.org>
Date: Wed Oct 11 00:40:03 2017

CHROMIUM: ext4: Remove broken support for detecting keyring key revocation

Per upstream commit 1b53cf9815bb ("fscrypt: remove broken support for detecting
keyring key revocation"), keyring revocation detection is broken, and the
underlying code has been removed in v4.4.61. Remove local code to avoid build
breakage after the merge.

BUG= chromium:711780 , chromium:726930 
TEST=Build after merge

Change-Id: I2bac509fa87ece8ddff7cd01a24ac71134045236
Signed-off-by: Guenter Roeck <groeck@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/479576
Reviewed-by: Dmitry Torokhov <dtor@chromium.org>
(cherry picked from commit f3e4b0af0b969fda15cb6e8294602fac15aa18d7)
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/549044
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Reviewed-by: Eric Biggers <ebiggers@google.com>

[modify] https://crrev.com/88e2cf81a7124331dea975f53b73d7a393e8d78d/fs/ext4/crypto.c

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/76a29c20fd562574c2970162e519becd7d6ddf0c

commit 76a29c20fd562574c2970162e519becd7d6ddf0c
Author: Guenter Roeck <groeck@chromium.org>
Date: Thu Oct 26 04:58:55 2017

CHROMIUM: ext4: Remove broken support for detecting keyring key revocation

Per upstream commit 1b53cf9815bb ("fscrypt: remove broken support for detecting
keyring key revocation"), keyring revocation detection is broken, and the
underlying code has been removed in v4.4.61. Remove local code to avoid build
breakage after the merge.

Apply to 3.14 as well, in ext4/crypto.c like in 3.18.

BUG= chromium:726930 , chromium:711780 
TEST=run xfstest on Samus

Change-Id: I2bac509fa87ece8ddff7cd01a24ac71134045236
Signed-off-by: Guenter Roeck <groeck@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/479576
Reviewed-by: Dmitry Torokhov <dtor@chromium.org>
(cherry picked from commit f3e4b0af0b969fda15cb6e8294602fac15aa18d7)
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/734008
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>

[modify] https://crrev.com/76a29c20fd562574c2970162e519becd7d6ddf0c/fs/ext4/crypto.c

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/third_party/kernel/+/d43a64d2dc08997f6073beb94d89e8576e7e5506

commit d43a64d2dc08997f6073beb94d89e8576e7e5506
Author: Guenter Roeck <groeck@chromium.org>
Date: Tue Dec 19 18:16:44 2017

CHROMIUM: ext4: Remove broken support for detecting keyring key revocation

Per upstream commit 1b53cf9815bb ("fscrypt: remove broken support for detecting
keyring key revocation"), keyring revocation detection is broken, and the
underlying code has been removed in v4.4.61. Remove local code to avoid build
breakage after the merge.

Apply to 3.14 as well, in ext4/crypto.c like in 3.18.

BUG= chromium:726930 , chromium:711780 
TEST=run xfstest on Samus

Change-Id: I2bac509fa87ece8ddff7cd01a24ac71134045236
Signed-off-by: Guenter Roeck <groeck@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/479576
Reviewed-by: Dmitry Torokhov <dtor@chromium.org>
(cherry picked from commit f3e4b0af0b969fda15cb6e8294602fac15aa18d7)
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/734008
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
(cherry picked from commit 76a29c20fd562574c2970162e519becd7d6ddf0c)
Reviewed-on: https://chromium-review.googlesource.com/834413

[modify] https://crrev.com/d43a64d2dc08997f6073beb94d89e8576e7e5506/fs/ext4/crypto.c