flow_dissector: Fix GRE header error path (d5774b93) · Commits · 戴 / test

Now, when an unexpected element in the GRE header appears, we break so the l4 ports are processed. But since the ports are processed unconditionally, there will be certainly random values dissected. Fix this by just bailing out in such situations. Signed-off-by:

Jiri Pirko <jiri@mellanox.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/core/flow_dissector.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -479,18 +479,18 @@ ip_proto_again:

		/* Only look inside GRE without routing */
		if (hdr->flags & GRE_ROUTING)
		break;
		goto out_good;

		/* Only look inside GRE for version 0 and 1 */
		gre_ver = ntohs(hdr->flags & GRE_VERSION);
		if (gre_ver > 1)
		break;
		goto out_good;

		proto = hdr->protocol;
		if (gre_ver) {
		/* Version1 must be PPTP, and check the flags */
		if (!(proto == GRE_PROTO_PPP && (hdr->flags & GRE_KEY)))
		break;
		goto out_good;
		}

		offset += sizeof(struct gre_base_hdr);

Admin message