1 files changed, 3 insertions, 1 deletions

diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
index 50d2235df732..5f315affc81e 100644
--- a/arch/s390/kernel/dis.c
+++ b/arch/s390/kernel/dis.c
@@ -1162,6 +1162,7 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr)
         unsigned int value;
         char separator;
         char *ptr;
+        int i;
 
         ptr = buffer;
         insn = find_insn(code);
@@ -1169,7 +1170,8 @@ static int print_insn(char *buffer, unsigned char *code, unsigned long addr)
                 ptr += sprintf(ptr, "%.5s\t", insn->name);
                 /* Extract the operands. */
                 separator = 0;
-                for (ops = formats[insn->format] + 1; *ops != 0; ops++) {
+                for (ops = formats[insn->format] + 1, i = 0;
+                     *ops != 0 && i < 6; ops++, i++) {
                         operand = operands + *ops;
                         value = extract_operand(code, operand);
                         if ((operand->flags & OPERAND_INDEX)  && value == 0)