From: Greg Kroah-Hartman Date: Mon, 25 Nov 2013 21:31:41 +0000 (-0800) Subject: 3.10-stable patches X-Git-Tag: v3.11.10~40 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df7c0e975d712e691e8c734410254103e8991e5a;p=thirdparty%2Fkernel%2Fstable-queue.git 3.10-stable patches added patches: sunrpc-don-t-map-ekeyexpired-to-eacces-in-call_refreshresult.patch --- diff --git a/queue-3.10/series b/queue-3.10/series index 1f8644eb779..d205ad42265 100644 --- a/queue-3.10/series +++ b/queue-3.10/series @@ -12,3 +12,4 @@ ipc-shm-correct-error-return-value-in-shmctl-shm_unlock.patch ipc-shm-fix-shm_file-deletion-races.patch drm-nv50-disp-remove-dcb_outp_match-call-and-related-variables.patch drm-nva3-disp-fix-hda-eld-writing-needs-to-be-padded.patch +sunrpc-don-t-map-ekeyexpired-to-eacces-in-call_refreshresult.patch diff --git a/queue-3.10/sunrpc-don-t-map-ekeyexpired-to-eacces-in-call_refreshresult.patch b/queue-3.10/sunrpc-don-t-map-ekeyexpired-to-eacces-in-call_refreshresult.patch new file mode 100644 index 00000000000..b77731a3d57 --- /dev/null +++ b/queue-3.10/sunrpc-don-t-map-ekeyexpired-to-eacces-in-call_refreshresult.patch @@ -0,0 +1,35 @@ +From f1ff0c27fd9987c59d707cd1a6b6c1fc3ae0a250 Mon Sep 17 00:00:00 2001 +From: Andy Adamson +Date: Wed, 14 Aug 2013 11:59:13 -0400 +Subject: SUNRPC: don't map EKEYEXPIRED to EACCES in call_refreshresult + +From: Andy Adamson + +commit f1ff0c27fd9987c59d707cd1a6b6c1fc3ae0a250 upstream. + +The NFS layer needs to know when a key has expired. +This change also returns -EKEYEXPIRED to the application, and the informative +"Key has expired" error message is displayed. The user then knows that +credential renewal is required. + +Signed-off-by: Andy Adamson +Signed-off-by: Trond Myklebust +Signed-off-by: Greg Kroah-Hartman + +--- + net/sunrpc/clnt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/net/sunrpc/clnt.c ++++ b/net/sunrpc/clnt.c +@@ -1407,9 +1407,9 @@ call_refreshresult(struct rpc_task *task + return; + case -ETIMEDOUT: + rpc_delay(task, 3*HZ); +- case -EKEYEXPIRED: + case -EAGAIN: + status = -EACCES; ++ case -EKEYEXPIRED: + if (!task->tk_cred_retry) + break; + task->tk_cred_retry--;