diff mbox

[nft,2/3] payload: fix crash when wrong ethernet protocol type is used

Message ID 1389817823-7251-2-git-send-email-pablo@netfilter.org
State Accepted
Headers show

Commit Message

Pablo Neira Ayuso Jan. 15, 2014, 8:30 p.m. UTC
nft add rule ip filter output meta protocol xyz counter
                                            ^^^

This fix is similar to 4097ad7 ("meta: fix crash when parsing
unresolvable mark values").

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/payload.c |    1 +
 1 file changed, 1 insertion(+)

Comments

Patrick McHardy Jan. 16, 2014, 4:29 p.m. UTC | #1
On Wed, Jan 15, 2014 at 09:30:22PM +0100, Pablo Neira Ayuso wrote:
> nft add rule ip filter output meta protocol xyz counter
>                                             ^^^
> 
> This fix is similar to 4097ad7 ("meta: fix crash when parsing
> unresolvable mark values").

I already fixed that for mark_type, but didn't realize we have more
instances of this. I double checked and we should be good now.

> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> ---
>  src/payload.c |    1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/src/payload.c b/src/payload.c
> index 86d75fa..decfcd6 100644
> --- a/src/payload.c
> +++ b/src/payload.c
> @@ -993,6 +993,7 @@ static struct error_record *ethertype_parse(const struct expr *sym,
>  {
>  	struct error_record *erec;
>  
> +	*res = NULL;
>  	erec = sym->dtype->basetype->parse(sym, res);
>  	if (erec != NULL)
>  		return erec;
> -- 
> 1.7.10.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/src/payload.c b/src/payload.c
index 86d75fa..decfcd6 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -993,6 +993,7 @@  static struct error_record *ethertype_parse(const struct expr *sym,
 {
 	struct error_record *erec;
 
+	*res = NULL;
 	erec = sym->dtype->basetype->parse(sym, res);
 	if (erec != NULL)
 		return erec;