Use proper upper limits for the loops and check for all error
conditions.

The problem was noticed by Adrian Bunk.
Signed-off-by: NMichael Chan <mchan@broadcom.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>