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

Commit 003504a2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-sched-actions-code-style-cleanup-and-fixes' 



Roman Mashak says:

====================
net sched actions: code style cleanup and fixes

The patchset fixes a few code stylistic issues and typos, as well as one
detected by sparse semantic checker tool.

No functional changes introduced.

Patch 1 & 2 fix coding style bits caught by the checkpatch.pl script
Patch 3 fixes an issue with a shadowed variable
Patch 4 adds sizeof() operator instead of magic number for buffer length
Patch 5 fixes typos in diagnostics messages
Patch 6 explicitly sets unsigned char for bitwise operation

v2:
   - submit for net-next
   - added Reviewed-by tags
   - use u8* instead of char* as per Davide Caratti suggestion
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0a9fe5c3 43052741

include/net/tc_act/tc_pedit.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ struct tcf_pedit { 
	struct tc_pedit_key	*tcfp_keys;

	struct tcf_pedit_key_ex	*tcfp_keys_ex;

};



#define to_pedit(a) ((struct tcf_pedit *)a)



static inline bool is_tcf_pedit(const struct tc_action *a)

include/uapi/linux/tc_act/tc_pedit.h

+7 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ enum { 
	TCA_PEDIT_KEY_EX,

	__TCA_PEDIT_MAX

};



#define TCA_PEDIT_MAX (__TCA_PEDIT_MAX - 1)



enum {
@@ -24,6 +25,7 @@ enum { 
	TCA_PEDIT_KEY_EX_CMD = 2,

	__TCA_PEDIT_KEY_EX_MAX

};



#define TCA_PEDIT_KEY_EX_MAX (__TCA_PEDIT_KEY_EX_MAX - 1)



 /* TCA_PEDIT_KEY_EX_HDR_TYPE_NETWROK is a special case for legacy users. It
@@ -38,6 +40,7 @@ enum pedit_header_type { 
	TCA_PEDIT_KEY_EX_HDR_TYPE_UDP = 5,

	__PEDIT_HDR_TYPE_MAX,

};



#define TCA_PEDIT_HDR_TYPE_MAX (__PEDIT_HDR_TYPE_MAX - 1)



enum pedit_cmd {
@@ -45,6 +48,7 @@ enum pedit_cmd { 
	TCA_PEDIT_KEY_EX_CMD_ADD = 1,

	__PEDIT_CMD_MAX,

};



#define TCA_PEDIT_CMD_MAX (__PEDIT_CMD_MAX - 1)



struct tc_pedit_key {
@@ -62,6 +66,7 @@ struct tc_pedit_sel { 
	unsigned char           flags;

	struct tc_pedit_key     keys[0];

};



#define tc_pedit tc_pedit_sel



#endif

net/sched/act_pedit.c

+23 −20
Original line number Diff line number Diff line
@@ -136,15 +136,15 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla, 
{

	struct tc_action_net *tn = net_generic(net, pedit_net_id);

	struct nlattr *tb[TCA_PEDIT_MAX + 1];

	struct nlattr *pattr;

	struct tc_pedit *parm;

	int ret = 0, err;

	struct tcf_pedit *p;

	struct tc_pedit_key *keys = NULL;

	struct tcf_pedit_key_ex *keys_ex;

	struct tc_pedit *parm;

	struct nlattr *pattr;

	struct tcf_pedit *p;

	int ret = 0, err;

	int ksize;



	if (nla == NULL)

	if (!nla)

		return -EINVAL;



	err = nla_parse_nested(tb, TCA_PEDIT_MAX, nla, pedit_policy, NULL);
@@ -175,7 +175,7 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla, 
			return ret;

		p = to_pedit(*a);

		keys = kmalloc(ksize, GFP_KERNEL);

		if (keys == NULL) {

		if (!keys) {

			tcf_idr_release(*a, bind);

			kfree(keys_ex);

			return -ENOMEM;
@@ -220,6 +220,7 @@ static void tcf_pedit_cleanup(struct tc_action *a) 
{

	struct tcf_pedit *p = to_pedit(a);

	struct tc_pedit_key *keys = p->tcfp_keys;



	kfree(keys);

	kfree(p->tcfp_keys_ex);

}
@@ -284,11 +285,12 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a, 
	if (p->tcfp_nkeys > 0) {

		struct tc_pedit_key *tkey = p->tcfp_keys;

		struct tcf_pedit_key_ex *tkey_ex = p->tcfp_keys_ex;

		enum pedit_header_type htype = TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK;

		enum pedit_header_type htype =

			TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK;

		enum pedit_cmd cmd = TCA_PEDIT_KEY_EX_CMD_SET;



		for (i = p->tcfp_nkeys; i > 0; i--, tkey++) {

			u32 *ptr, _data;

			u32 *ptr, hdata;

			int offset = tkey->off;

			int hoffset;

			u32 val;
@@ -303,39 +305,39 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a, 


			rc = pedit_skb_hdr_offset(skb, htype, &hoffset);

			if (rc) {

				pr_info("tc filter pedit bad header type specified (0x%x)\n",

				pr_info("tc action pedit bad header type specified (0x%x)\n",

					htype);

				goto bad;

			}



			if (tkey->offmask) {

				char *d, _d;

				u8 *d, _d;



				if (!offset_valid(skb, hoffset + tkey->at)) {

					pr_info("tc filter pedit 'at' offset %d out of bounds\n",

					pr_info("tc action pedit 'at' offset %d out of bounds\n",

						hoffset + tkey->at);

					goto bad;

				}

				d = skb_header_pointer(skb, hoffset + tkey->at, 1,

						       &_d);

				d = skb_header_pointer(skb, hoffset + tkey->at,

						       sizeof(_d), &_d);

				if (!d)

					goto bad;

				offset += (*d & tkey->offmask) >> tkey->shift;

			}



			if (offset % 4) {

				pr_info("tc filter pedit"

					" offset must be on 32 bit boundaries\n");

				pr_info("tc action pedit offset must be on 32 bit boundaries\n");

				goto bad;

			}



			if (!offset_valid(skb, hoffset + offset)) {

				pr_info("tc filter pedit offset %d out of bounds\n",

				pr_info("tc action pedit offset %d out of bounds\n",

					hoffset + offset);

				goto bad;

			}



			ptr = skb_header_pointer(skb, hoffset + offset, 4, &_data);

			ptr = skb_header_pointer(skb, hoffset + offset,

						 sizeof(hdata), &hdata);

			if (!ptr)

				goto bad;

			/* just do it, baby */
@@ -347,19 +349,20 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a, 
				val = (*ptr + tkey->val) & ~tkey->mask;

				break;

			default:

				pr_info("tc filter pedit bad command (%d)\n",

				pr_info("tc action pedit bad command (%d)\n",

					cmd);

				goto bad;

			}



			*ptr = ((*ptr & tkey->mask) ^ val);

			if (ptr == &_data)

			if (ptr == &hdata)

				skb_store_bits(skb, hoffset + offset, ptr, 4);

		}



		goto done;

	} else

	} else {

		WARN(1, "pedit BUG: index %d\n", p->tcf_index);

	}



bad:

	p->tcf_qstats.overlimits++;