* [patch] [AX.25]: small cleanup in ax25_addr_parse()
@ 2012-07-05 8:27 Dan Carpenter
2012-07-09 7:16 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2012-07-05 8:27 UTC (permalink / raw)
To: Ralf Baechle; +Cc: David S. Miller, linux-hams, netdev, kernel-janitors
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>
diff --git a/net/ax25/ax25_addr.c b/net/ax25/ax25_addr.c
index 9162409..e7c9b0e 100644
--- a/net/ax25/ax25_addr.c
+++ b/net/ax25/ax25_addr.c
@@ -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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] [AX.25]: small cleanup in ax25_addr_parse()
2012-07-05 8:27 [patch] [AX.25]: small cleanup in ax25_addr_parse() Dan Carpenter
@ 2012-07-09 7:16 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-07-09 7:16 UTC (permalink / raw)
To: dan.carpenter; +Cc: ralf, linux-hams, netdev, kernel-janitors
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 5 Jul 2012 11:27:18 +0300
> 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>
Applied, thanks Dan.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-09 7:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-05 8:27 [patch] [AX.25]: small cleanup in ax25_addr_parse() Dan Carpenter
2012-07-09 7:16 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox