AFS: Correctly translate auth error aborts and don't failover in such cases

Authentication error abort codes should be translated to appropriate
Linux error codes, rather than all being translated to EREMOTEIO - which
indicates that the server had internal problems.

Additionally, a server shouldn't be marked unavailable and the next
server tried if an authentication error occurs.  This will quickly make
all the servers unavailable to the client.  Instead the error should be
returned straight to the user.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/afs/misc.c b/fs/afs/misc.c
index 2d33a5f7d218ad75cf26ec973f10e5958fc5a57d..0dd4dafee10b391f7d92b89f8c4e491ed5f09810 100644 (file)
--- a/fs/afs/misc.c
+++ b/fs/afs/misc.c
@@ -12,6 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/errno.h>
+#include <rxrpc/packet.h>
 #include "internal.h"
 #include "afs_fs.h"
 
@@ -54,6 +55,21 @@ int afs_abort_to_error(u32 abort_code)
        case 0x2f6df24:         return -ENOLCK;
        case 0x2f6df26:         return -ENOTEMPTY;
        case 0x2f6df78:         return -EDQUOT;
+
+       case RXKADINCONSISTENCY: return -EPROTO;
+       case RXKADPACKETSHORT:  return -EPROTO;
+       case RXKADLEVELFAIL:    return -EKEYREJECTED;
+       case RXKADTICKETLEN:    return -EKEYREJECTED;
+       case RXKADOUTOFSEQUENCE: return -EPROTO;
+       case RXKADNOAUTH:       return -EKEYREJECTED;
+       case RXKADBADKEY:       return -EKEYREJECTED;
+       case RXKADBADTICKET:    return -EKEYREJECTED;
+       case RXKADUNKNOWNKEY:   return -EKEYREJECTED;
+       case RXKADEXPIRED:      return -EKEYEXPIRED;
+       case RXKADSEALEDINCON:  return -EKEYREJECTED;
+       case RXKADDATALEN:      return -EKEYREJECTED;
+       case RXKADILLEGALLEVEL: return -EKEYREJECTED;
+
        default:                return -EREMOTEIO;
        }
 }

diff --git a/fs/afs/vlocation.c b/fs/afs/vlocation.c
index ec2a7431e458b52c89795f6ba9c01a2efe8aa254..6e689208def255c946cf39d1f44c562aedf51448 100644 (file)
--- a/fs/afs/vlocation.c
+++ b/fs/afs/vlocation.c
@@ -65,6 +65,8 @@ static int afs_vlocation_access_vl_by_name(struct afs_vlocation *vl,
                                goto out;
                        goto rotate;
                case -ENOMEDIUM:
+               case -EKEYREJECTED:
+               case -EKEYEXPIRED:
                        goto out;
                default:
                        ret = -EIO;