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

Commit 059a2440 authored by Bojan Prtvar's avatar Bojan Prtvar Committed by David S. Miller
Browse files

net: Remove state argument from skb_find_text() 



Although it is clear that textsearch state is intentionally passed to
skb_find_text() as uninitialized argument, it was never used by the
callers. Therefore, we can simplify skb_find_text() by making it
local variable.

Signed-off-by: default avatarBojan Prtvar <prtvar.b@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d340c862

include/linux/skbuff.h

+1 −2
Original line number Diff line number Diff line
@@ -870,8 +870,7 @@ unsigned int skb_seq_read(unsigned int consumed, const u8 **data, 
void skb_abort_seq_read(struct skb_seq_state *st);



unsigned int skb_find_text(struct sk_buff *skb, unsigned int from,

			   unsigned int to, struct ts_config *config,

			   struct ts_state *state);

			   unsigned int to, struct ts_config *config);



/*

 * Packet hash types specify the type of hash in skb_set_hash.

net/core/skbuff.c

+4 −5
Original line number Diff line number Diff line
@@ -2865,7 +2865,6 @@ static void skb_ts_finish(struct ts_config *conf, struct ts_state *state) 
 * @from: search offset

 * @to: search limit

 * @config: textsearch configuration

 * @state: uninitialized textsearch state variable

 *

 * Finds a pattern in the skb data according to the specified

 * textsearch configuration. Use textsearch_next() to retrieve
@@ -2873,17 +2872,17 @@ static void skb_ts_finish(struct ts_config *conf, struct ts_state *state) 
 * to the first occurrence or UINT_MAX if no match was found.

 */

unsigned int skb_find_text(struct sk_buff *skb, unsigned int from,

			   unsigned int to, struct ts_config *config,

			   struct ts_state *state)

			   unsigned int to, struct ts_config *config)

{

	struct ts_state state;

	unsigned int ret;



	config->get_next_block = skb_ts_get_next_block;

	config->finish = skb_ts_finish;



	skb_prepare_seq_read(skb, from, to, TS_SKB_CB(state));

	skb_prepare_seq_read(skb, from, to, TS_SKB_CB(&state));



	ret = textsearch_find(config, state);

	ret = textsearch_find(config, &state);

	return (ret <= to - from ? ret : UINT_MAX);

}

EXPORT_SYMBOL(skb_find_text);

net/netfilter/nf_conntrack_amanda.c

+3 −7
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ static int amanda_help(struct sk_buff *skb, 
		       struct nf_conn *ct,

		       enum ip_conntrack_info ctinfo)

{

	struct ts_state ts;

	struct nf_conntrack_expect *exp;

	struct nf_conntrack_tuple *tuple;

	unsigned int dataoff, start, stop, off, i;
@@ -113,23 +112,20 @@ static int amanda_help(struct sk_buff *skb, 
		return NF_ACCEPT;

	}



	memset(&ts, 0, sizeof(ts));

	start = skb_find_text(skb, dataoff, skb->len,

			      search[SEARCH_CONNECT].ts, &ts);

			      search[SEARCH_CONNECT].ts);

	if (start == UINT_MAX)

		goto out;

	start += dataoff + search[SEARCH_CONNECT].len;



	memset(&ts, 0, sizeof(ts));

	stop = skb_find_text(skb, start, skb->len,

			     search[SEARCH_NEWLINE].ts, &ts);

			     search[SEARCH_NEWLINE].ts);

	if (stop == UINT_MAX)

		goto out;

	stop += start;



	for (i = SEARCH_DATA; i <= SEARCH_INDEX; i++) {

		memset(&ts, 0, sizeof(ts));

		off = skb_find_text(skb, start, stop, search[i].ts, &ts);

		off = skb_find_text(skb, start, stop, search[i].ts);

		if (off == UINT_MAX)

			continue;

		off += start + search[i].len;

net/netfilter/xt_string.c

+1 −2
Original line number Diff line number Diff line
@@ -26,13 +26,12 @@ static bool 
string_mt(const struct sk_buff *skb, struct xt_action_param *par)

{

	const struct xt_string_info *conf = par->matchinfo;

	struct ts_state state;

	bool invert;



	invert = conf->u.v1.flags & XT_STRING_FLAG_INVERT;



	return (skb_find_text((struct sk_buff *)skb, conf->from_offset,

			     conf->to_offset, conf->config, &state)

			     conf->to_offset, conf->config)

			     != UINT_MAX) ^ invert;

}

net/sched/em_text.c

+1 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ static int em_text_match(struct sk_buff *skb, struct tcf_ematch *m, 
{

	struct text_match *tm = EM_TEXT_PRIV(m);

	int from, to;

	struct ts_state state;



	from = tcf_get_base_ptr(skb, tm->from_layer) - skb->data;

	from += tm->from_offset;
@@ -42,7 +41,7 @@ static int em_text_match(struct sk_buff *skb, struct tcf_ematch *m, 
	to = tcf_get_base_ptr(skb, tm->to_layer) - skb->data;

	to += tm->to_offset;



	return skb_find_text(skb, from, to, tm->config, &state) != UINT_MAX;

	return skb_find_text(skb, from, to, tm->config) != UINT_MAX;

}



static int em_text_change(struct net *net, void *data, int len,