]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
small cleanup in ax25_addr_parse()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 4 Jul 2012 22:27:18 +0000 (22:27 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Jul 2012 07:16:16 +0000 (00:16 -0700)
The comments were wrong here because "AX25_MAX_DIGIS" is 8 but the
comments say 6.  Also I've changed the "7" to "AX25_ADDR_LEN".

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ax25/ax25_addr.c

index 9162409559cf3b3845f6eb27c36f7d81b9409851..e7c9b0ea17a170b19ee91cc2a9ba1c7c06eb20de 100644 (file)
@@ -189,8 +189,10 @@ const unsigned char *ax25_addr_parse(const unsigned char *buf, int len,
        digi->ndigi      = 0;
 
        while (!(buf[-1] & AX25_EBIT)) {
-               if (d >= AX25_MAX_DIGIS)  return NULL;  /* Max of 6 digis */
-               if (len < 7) return NULL;       /* Short packet */
+               if (d >= AX25_MAX_DIGIS)
+                       return NULL;
+               if (len < AX25_ADDR_LEN)
+                       return NULL;
 
                memcpy(&digi->calls[d], buf, AX25_ADDR_LEN);
                digi->ndigi = d + 1;