Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 656caff2 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

netfilter 04/09: x_tables: fix match/target revision lookup 



Commit 55b69e91 (netfilter: implement NFPROTO_UNSPEC as a wildcard
for extensions) broke revision probing for matches and targets that
are registered with NFPROTO_UNSPEC.

Fix by continuing the search on the NFPROTO_UNSPEC list if nothing
is found on the af-specific lists.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47e0e1ca

net/netfilter/x_tables.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -273,6 +273,10 @@ static int match_revfn(u8 af, const char *name, u8 revision, int *bestp) 
				have_rev = 1;

				have_rev = 1;

		}

		}

	}

	}



	if (af != NFPROTO_UNSPEC && !have_rev)

		return match_revfn(NFPROTO_UNSPEC, name, revision, bestp);



	return have_rev;

	return have_rev;

}

}
@@ -289,6 +293,10 @@ static int target_revfn(u8 af, const char *name, u8 revision, int *bestp) 
				have_rev = 1;

				have_rev = 1;

		}

		}

	}

	}



	if (af != NFPROTO_UNSPEC && !have_rev)

		return target_revfn(NFPROTO_UNSPEC, name, revision, bestp);



	return have_rev;

	return have_rev;

}

}