diff options
author | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
commit | cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db (patch) | |
tree | 90d1093131d2a3543a8b3b1f3364e7c6f4081a93 /net/rxrpc/ar-key.c | |
parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
parent | 74192246910ff4fb95309ba1a683215644beeb62 (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'net/rxrpc/ar-key.c')
-rw-r--r-- | net/rxrpc/ar-key.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/rxrpc/ar-key.c b/net/rxrpc/ar-key.c index 9a8ff684da79..ad8c7a782da1 100644 --- a/net/rxrpc/ar-key.c +++ b/net/rxrpc/ar-key.c | |||
@@ -287,6 +287,7 @@ int rxrpc_get_server_data_key(struct rxrpc_connection *conn, | |||
287 | time_t expiry, | 287 | time_t expiry, |
288 | u32 kvno) | 288 | u32 kvno) |
289 | { | 289 | { |
290 | const struct cred *cred = current_cred(); | ||
290 | struct key *key; | 291 | struct key *key; |
291 | int ret; | 292 | int ret; |
292 | 293 | ||
@@ -297,7 +298,7 @@ int rxrpc_get_server_data_key(struct rxrpc_connection *conn, | |||
297 | 298 | ||
298 | _enter(""); | 299 | _enter(""); |
299 | 300 | ||
300 | key = key_alloc(&key_type_rxrpc, "x", 0, 0, current, 0, | 301 | key = key_alloc(&key_type_rxrpc, "x", 0, 0, cred, 0, |
301 | KEY_ALLOC_NOT_IN_QUOTA); | 302 | KEY_ALLOC_NOT_IN_QUOTA); |
302 | if (IS_ERR(key)) { | 303 | if (IS_ERR(key)) { |
303 | _leave(" = -ENOMEM [alloc %ld]", PTR_ERR(key)); | 304 | _leave(" = -ENOMEM [alloc %ld]", PTR_ERR(key)); |
@@ -340,10 +341,11 @@ EXPORT_SYMBOL(rxrpc_get_server_data_key); | |||
340 | */ | 341 | */ |
341 | struct key *rxrpc_get_null_key(const char *keyname) | 342 | struct key *rxrpc_get_null_key(const char *keyname) |
342 | { | 343 | { |
344 | const struct cred *cred = current_cred(); | ||
343 | struct key *key; | 345 | struct key *key; |
344 | int ret; | 346 | int ret; |
345 | 347 | ||
346 | key = key_alloc(&key_type_rxrpc, keyname, 0, 0, current, | 348 | key = key_alloc(&key_type_rxrpc, keyname, 0, 0, cred, |
347 | KEY_POS_SEARCH, KEY_ALLOC_NOT_IN_QUOTA); | 349 | KEY_POS_SEARCH, KEY_ALLOC_NOT_IN_QUOTA); |
348 | if (IS_ERR(key)) | 350 | if (IS_ERR(key)) |
349 | return key; | 351 | return key; |