From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 25 Jun 2015 13:09:33 +0000 (+0200)
Subject: payload: fix transport matching with no network layer info in bridge family
X-Git-Tag: v0.5~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b02d536c265cd55eb7a4679a1297a8f5a8b42211;p=thirdparty%2Fnftables.git

payload: fix transport matching with no network layer info in bridge family

 # nft --debug=netlink add rule bridge filter input tcp dport 22
 bridge filter input
  [ meta load l4proto => reg 1 ]
  [ cmp eq reg 1 0x00000006 ]
  [ payload load 2b @ transport header + 2 => reg 1 ]
  [ cmp eq reg 1 0x00001600 ]

Reported-by: Eric Leblond <eric@regit.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/payload.c b/src/payload.c
index 08578fd86..e67ef17c8 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -219,6 +219,9 @@ int payload_gen_dependency(struct eval_ctx *ctx, const struct expr *expr,
 			case PROTO_BASE_LL_HDR:
 				desc = &proto_eth;
 				break;
+			case PROTO_BASE_TRANSPORT_HDR:
+				desc = &proto_inet_service;
+				break;
 			default:
 				break;
 			}