git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' into next
[pandora-kernel.git]
/
net
/
sunrpc
/
auth_gss
/
gss_spkm3_mech.c
diff --git
a/net/sunrpc/auth_gss/gss_spkm3_mech.c
b/net/sunrpc/auth_gss/gss_spkm3_mech.c
index
5deb4b6
..
035e1dd
100644
(file)
--- a/
net/sunrpc/auth_gss/gss_spkm3_mech.c
+++ b/
net/sunrpc/auth_gss/gss_spkm3_mech.c
@@
-76,7
+76,7
@@
simple_get_netobj(const void *p, const void *end, struct xdr_netobj *res)
q = (const void *)((const char *)p + len);
if (unlikely(q > end || q < p))
return ERR_PTR(-EFAULT);
q = (const void *)((const char *)p + len);
if (unlikely(q > end || q < p))
return ERR_PTR(-EFAULT);
- res->data = kmemdup(p, len, GFP_
KERNEL
);
+ res->data = kmemdup(p, len, GFP_
NOFS
);
if (unlikely(res->data == NULL))
return ERR_PTR(-ENOMEM);
return q;
if (unlikely(res->data == NULL))
return ERR_PTR(-ENOMEM);
return q;
@@
-90,7
+90,7
@@
gss_import_sec_context_spkm3(const void *p, size_t len,
struct spkm3_ctx *ctx;
int version;
struct spkm3_ctx *ctx;
int version;
- if (!(ctx = kzalloc(sizeof(*ctx), GFP_
KERNEL
)))
+ if (!(ctx = kzalloc(sizeof(*ctx), GFP_
NOFS
)))
goto out_err;
p = simple_get_bytes(p, end, &version, sizeof(version));
goto out_err;
p = simple_get_bytes(p, end, &version, sizeof(version));