diff --git a/[refs] b/[refs]
index 8cdf858d9897..4d6bca4e6acb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67114fe6103183190fb0a24f58e5695a80beb2ec
+refs/heads/master: b2ea70afade7080360ac55c4e64ff7a5fafdb67b
diff --git a/trunk/fs/nfsd/export.c b/trunk/fs/nfsd/export.c
index 62f3b9074e84..5f312abf1247 100644
--- a/trunk/fs/nfsd/export.c
+++ b/trunk/fs/nfsd/export.c
@@ -87,7 +87,7 @@ static int expkey_parse(struct cache_detail *cd, char *mesg, int mlen)
 	struct svc_expkey key;
 	struct svc_expkey *ek = NULL;
 
-	if (mesg[mlen-1] != '\n')
+	if (mlen < 1 || mesg[mlen-1] != '\n')
 		return -EINVAL;
 	mesg[mlen-1] = 0;