diff --git a/[refs] b/[refs]
index aba0473dc5ca..8f836b720bf0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45575f5a426c01ec68cd33d998267ba2f6278fac
+refs/heads/master: 99b437a9257cb6b267bf32adfb7675948dc6d485
diff --git a/trunk/fs/afs/security.c b/trunk/fs/afs/security.c
index 3ef504370034..bb4ed144d0e4 100644
--- a/trunk/fs/afs/security.c
+++ b/trunk/fs/afs/security.c
@@ -189,8 +189,9 @@ void afs_cache_permit(struct afs_vnode *vnode, struct key *key, long acl_order)
 	if (!permits)
 		goto out_unlock;
 
-	memcpy(permits->permits, xpermits->permits,
-	       count * sizeof(struct afs_permit));
+	if (xpermits)
+		memcpy(permits->permits, xpermits->permits,
+			count * sizeof(struct afs_permit));
 
 	_debug("key %x access %x",
 	       key_serial(key), vnode->status.caller_access);