Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor overlapping changes in the btusb and ixgbe drivers.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 0 deletions

diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c
index e73ec040e250..ecba39c93fd9 100644
--- a/security/keys/request_key_auth.c
+++ b/security/keys/request_key_auth.c
@@ -66,6 +66,9 @@ static void request_key_auth_describe(const struct key *key,
 {
         struct request_key_auth *rka = dereference_key_rcu(key);
 
+        if (!rka)
+                return;
+
         seq_puts(m, "key:");
         seq_puts(m, key->description);
         if (key_is_positive(key))
@@ -83,6 +86,9 @@ static long request_key_auth_read(const struct key *key,
         size_t datalen;
         long ret;
 
+        if (!rka)
+                return -EKEYREVOKED;
+
         datalen = rka->callout_len;
         ret = datalen;