netdev - Re: [PATCH v3 1/9] ptp: Add generic ptp v2 header parsing function

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Thu, 30 Jul 2020 12:15:17 +0200
From:   Petr Machata <petrm@...lanox.com>
To:     Kurt Kanzenbach <kurt@...utronix.de>
Cc:     Richard Cochran <richardcochran@...il.com>,
        Andrew Lunn <andrew@...n.ch>,
        Vivien Didelot <vivien.didelot@...il.com>,
        Florian Fainelli <f.fainelli@...il.com>,
        "David S. Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        Jiri Pirko <jiri@...lanox.com>,
        Ido Schimmel <idosch@...lanox.com>,
        Heiner Kallweit <hkallweit1@...il.com>,
        Russell King <linux@...linux.org.uk>,
        Grygorii Strashko <grygorii.strashko@...com>,
        Ivan Khoronzhuk <ivan.khoronzhuk@...aro.org>,
        Samuel Zou <zou_wei@...wei.com>, netdev@...r.kernel.org,
        Russell King <rmk+kernel@...linux.org.uk>
Subject: Re: [PATCH v3 1/9] ptp: Add generic ptp v2 header parsing function


Kurt Kanzenbach <kurt@...utronix.de> writes:

> @@ -107,6 +107,37 @@ unsigned int ptp_classify_raw(const struct sk_buff *skb)
>  }
>  EXPORT_SYMBOL_GPL(ptp_classify_raw);
>  
> +struct ptp_header *ptp_parse_header(struct sk_buff *skb, unsigned int type)
> +{
> +	u8 *data = skb_mac_header(skb);
> +	u8 *ptr = data;

One of the "data" and "ptr" variables is superfluous.

> +
> +	if (type & PTP_CLASS_VLAN)
> +		ptr += VLAN_HLEN;
> +
> +	switch (type & PTP_CLASS_PMASK) {
> +	case PTP_CLASS_IPV4:
> +		ptr += IPV4_HLEN(ptr) + UDP_HLEN;
> +		break;
> +	case PTP_CLASS_IPV6:
> +		ptr += IP6_HLEN + UDP_HLEN;
> +		break;
> +	case PTP_CLASS_L2:
> +		break;
> +	default:
> +		return NULL;
> +	}
> +
> +	ptr += ETH_HLEN;
> +
> +	/* Ensure that the entire header is present in this packet. */
> +	if (ptr + sizeof(struct ptp_header) > skb->data + skb->len)
> +		return NULL;

Looks correct.

> +	return (struct ptp_header *)ptr;
> +}
> +EXPORT_SYMBOL_GPL(ptp_parse_header);
> +
>  void __init ptp_classifier_init(void)
>  {
>  	static struct sock_filter ptp_filter[] __initdata = {