Commit 8971ee8b authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nfnetlink_cthelper: hit EBUSY on updates if size mismatches 



The private helper data size cannot be updated. However, updates that
contain NFCTH_PRIV_DATA_LEN might bogusly hit EBUSY even if the size is
the same.

Fixes: 12f7a505 ("netfilter: add user-space connection tracking helper infrastructure")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 1710eb91

net/netfilter/nfnetlink_cthelper.c

+6 −2
Original line number Diff line number Diff line
@@ -380,10 +380,14 @@ static int 
nfnl_cthelper_update(const struct nlattr * const tb[],

		     struct nf_conntrack_helper *helper)

{

	u32 size;

	int ret;



	if (tb[NFCTH_PRIV_DATA_LEN])

	if (tb[NFCTH_PRIV_DATA_LEN]) {

		size = ntohl(nla_get_be32(tb[NFCTH_PRIV_DATA_LEN]));

		if (size != helper->data_len)

			return -EBUSY;

	}



	if (tb[NFCTH_POLICY]) {

		ret = nfnl_cthelper_update_policy(helper, tb[NFCTH_POLICY]);