Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

1 files changed, 3 insertions, 1 deletions

diff --git a/net/ceph/armor.c b/net/ceph/armor.c
index eb2a666b0be7..1fc1ee11dfa2 100644
--- a/net/ceph/armor.c
+++ b/net/ceph/armor.c
@@ -78,8 +78,10 @@ int ceph_unarmor(char *dst, const char *src, const char *end)
         while (src < end) {
                 int a, b, c, d;
 
-                if (src < end && src[0] == '\n')
+                if (src[0] == '\n') {
                         src++;
+                        continue;
+                }
                 if (src + 4 > end)
                         return -EINVAL;
                 a = decode_bits(src[0]);