NFS: Don't use GFP_KERNEL in rpcsec_gss downcalls

Again, we can deadlock if the memory reclaim triggers a writeback that
requires a rpcsec_gss credential lookup.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/net/sunrpc/auth_gss/gss_krb5_keys.c b/net/sunrpc/auth_gss/gss_krb5_keys.c
index 33b87f04b30b..76e42e6be755 100644
--- a/net/sunrpc/auth_gss/gss_krb5_keys.c
+++ b/net/sunrpc/auth_gss/gss_krb5_keys.c
@@ -150,7 +150,8 @@ static void krb5_nfold(u32 inbits, const u8 *in,
 u32 krb5_derive_key(const struct gss_krb5_enctype *gk5e,
                     const struct xdr_netobj *inkey,
                     struct xdr_netobj *outkey,
-                    const struct xdr_netobj *in_constant)
+                    const struct xdr_netobj *in_constant,
+                    gfp_t gfp_mask)
 {
         size_t blocksize, keybytes, keylength, n;
         unsigned char *inblockdata, *outblockdata, *rawkey;
@@ -175,15 +176,15 @@ u32 krb5_derive_key(const struct gss_krb5_enctype *gk5e,
         /* allocate and set up buffers */
 
         ret = ENOMEM;
-        inblockdata = kmalloc(blocksize, GFP_KERNEL);
+        inblockdata = kmalloc(blocksize, gfp_mask);
         if (inblockdata == NULL)
                 goto err_free_cipher;
 
-        outblockdata = kmalloc(blocksize, GFP_KERNEL);
+        outblockdata = kmalloc(blocksize, gfp_mask);
         if (outblockdata == NULL)
                 goto err_free_in;
 
-        rawkey = kmalloc(keybytes, GFP_KERNEL);
+        rawkey = kmalloc(keybytes, gfp_mask);
         if (rawkey == NULL)
                 goto err_free_out;