| Message ID | 1446207244-2206-2-git-send-email-stefan.sorensen@spectralink.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, Oct 30, 2015 at 01:14:00PM +0100, Stefan Sørensen wrote: > Only using the message type and sequence id for matching timestamps with > packets is error prone, particularly if packets can be reordered. Fix by > extending the check to include the hash of bytes 20-29 (source id in PTPv2) > that is provided with the timestamps. The example of reordered packets is bogus, since the sequence numbers are not affected. The one case that benefits from the hash check is when the port is in the master role and multiple clients send Delay_Req messages all with the same sequence number by chance. > @@ -819,11 +820,18 @@ static int match(struct sk_buff *skb, unsigned int type, struct rxts *rxts) > msgtype = data + offset + OFF_PTP_CONTROL; > else > msgtype = data + offset; > + if (rxts->msgtype != (*msgtype & 0xf)) > + return 0; > > seqid = (u16 *)(data + offset + OFF_PTP_SEQUENCE_ID); > + if (rxts->seqid != ntohs(*seqid)) > + return 0; > + > + hash = ether_crc(10, data + offset + 20) >> 20; This could use a macro instead of magic 20. Thanks, Richard > + if (rxts->hash != hash) > + return 0; > > - return rxts->msgtype == (*msgtype & 0xf) && > - rxts->seqid == ntohs(*seqid); > + return 1; > } > > static void decode_rxts(struct dp83640_private *dp83640, > -- > 2.5.0 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c index 185b03c..9534478 100644 --- a/drivers/net/phy/dp83640.c +++ b/drivers/net/phy/dp83640.c @@ -20,6 +20,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/crc32.h> #include <linux/ethtool.h> #include <linux/kernel.h> #include <linux/list.h> @@ -789,7 +790,7 @@ static int decode_evnt(struct dp83640_private *dp83640, static int match(struct sk_buff *skb, unsigned int type, struct rxts *rxts) { - u16 *seqid; + u16 *seqid, hash; unsigned int offset = 0; u8 *msgtype, *data = skb_mac_header(skb); @@ -819,11 +820,18 @@ static int match(struct sk_buff *skb, unsigned int type, struct rxts *rxts) msgtype = data + offset + OFF_PTP_CONTROL; else msgtype = data + offset; + if (rxts->msgtype != (*msgtype & 0xf)) + return 0; seqid = (u16 *)(data + offset + OFF_PTP_SEQUENCE_ID); + if (rxts->seqid != ntohs(*seqid)) + return 0; + + hash = ether_crc(10, data + offset + 20) >> 20; + if (rxts->hash != hash) + return 0; - return rxts->msgtype == (*msgtype & 0xf) && - rxts->seqid == ntohs(*seqid); + return 1; } static void decode_rxts(struct dp83640_private *dp83640,
Only using the message type and sequence id for matching timestamps with packets is error prone, particularly if packets can be reordered. Fix by extending the check to include the hash of bytes 20-29 (source id in PTPv2) that is provided with the timestamps. Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com> --- drivers/net/phy/dp83640.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)