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

Commit d505165f authored by Florian Westphal's avatar Florian Westphal Committed by Greg Kroah-Hartman
Browse files

netfilter: ebtables: convert BUG_ONs to WARN_ONs 



[ Upstream commit fc6a5d0601c5ac1d02f283a46f60b87b2033e5ca ]

All of these conditions are not fatal and should have
been WARN_ONs from the get-go.

Convert them to WARN_ONs and bail out.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4cf517fc

net/bridge/netfilter/ebtables.c

+18 −9
Original line number Diff line number Diff line
@@ -1625,7 +1625,8 @@ static int compat_match_to_user(struct ebt_entry_match *m, void __user **dstptr, 
	int off = ebt_compat_match_offset(match, m->match_size);

	compat_uint_t msize = m->match_size - off;



	BUG_ON(off >= m->match_size);

	if (WARN_ON(off >= m->match_size))

		return -EINVAL;



	if (copy_to_user(cm->u.name, match->name,

	    strlen(match->name) + 1) || put_user(msize, &cm->match_size))
@@ -1652,7 +1653,8 @@ static int compat_target_to_user(struct ebt_entry_target *t, 
	int off = xt_compat_target_offset(target);

	compat_uint_t tsize = t->target_size - off;



	BUG_ON(off >= t->target_size);

	if (WARN_ON(off >= t->target_size))

		return -EINVAL;



	if (copy_to_user(cm->u.name, target->name,

	    strlen(target->name) + 1) || put_user(tsize, &cm->match_size))
@@ -1880,7 +1882,8 @@ static int ebt_buf_add(struct ebt_entries_buf_state *state, 
	if (state->buf_kern_start == NULL)

		goto count_only;



	BUG_ON(state->buf_kern_offset + sz > state->buf_kern_len);

	if (WARN_ON(state->buf_kern_offset + sz > state->buf_kern_len))

		return -EINVAL;



	memcpy(state->buf_kern_start + state->buf_kern_offset, data, sz);
@@ -1893,7 +1896,8 @@ static int ebt_buf_add_pad(struct ebt_entries_buf_state *state, unsigned int sz) 
{

	char *b = state->buf_kern_start;



	BUG_ON(b && state->buf_kern_offset > state->buf_kern_len);

	if (WARN_ON(b && state->buf_kern_offset > state->buf_kern_len))

		return -EINVAL;



	if (b != NULL && sz > 0)

		memset(b + state->buf_kern_offset, 0, sz);
@@ -1970,8 +1974,10 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt, 
	pad = XT_ALIGN(size_kern) - size_kern;



	if (pad > 0 && dst) {

		BUG_ON(state->buf_kern_len <= pad);

		BUG_ON(state->buf_kern_offset - (match_size + off) + size_kern > state->buf_kern_len - pad);

		if (WARN_ON(state->buf_kern_len <= pad))

			return -EINVAL;

		if (WARN_ON(state->buf_kern_offset - (match_size + off) + size_kern > state->buf_kern_len - pad))

			return -EINVAL;

		memset(dst + size_kern, 0, pad);

	}

	return off + match_size;
@@ -2021,7 +2027,8 @@ static int ebt_size_mwt(struct compat_ebt_entry_mwt *match32, 
		if (ret < 0)

			return ret;



		BUG_ON(ret < match32->match_size);

		if (WARN_ON(ret < match32->match_size))

			return -EINVAL;

		growth += ret - match32->match_size;

		growth += ebt_compat_entry_padsize();
@@ -2130,7 +2137,8 @@ static int size_entry_mwt(struct ebt_entry *entry, const unsigned char *base, 


	startoff = state->buf_user_offset - startoff;



	BUG_ON(*total < startoff);

	if (WARN_ON(*total < startoff))

		return -EINVAL;

	*total -= startoff;

	return 0;

}
@@ -2257,7 +2265,8 @@ static int compat_do_replace(struct net *net, void __user *user, 
	state.buf_kern_len = size64;



	ret = compat_copy_entries(entries_tmp, tmp.entries_size, &state);

	BUG_ON(ret < 0);	/* parses same data again */

	if (WARN_ON(ret < 0))

		goto out_unlock;



	vfree(entries_tmp);

	tmp.entries_size = size64;