net: cls_api: remove unneeded local variable in tc_dump_chain() (0ad41b24) · Commits · 戴 / test

make clang-analyzer on x86_64 defconfig caught my attention with: net/sched/cls_api.c:2964:3: warning: Value stored to 'parent' is never read [clang-analyzer-deadcode.DeadStores] parent = 0; ^ net/sched/cls_api.c:2977:4: warning: Value stored to 'parent' is never read [clang-analyzer-deadcode.DeadStores] parent = q->handle; ^ Commit ("net: sched: introduce chain object to uapi") introduced tc_dump_chain() and this initial implementation already contained these unneeded dead stores. Simplify the code to make clang-analyzer happy. As compilers will detect these unneeded assignments and optimize this anyway, the resulting binary is identical before and after this change. No functional change. No change in object code. Signed-off-by:

Lukas Bulwahn <lukas.bulwahn@gmail.com> Link: https://lore.kernel.org/r/20201028113533.26160-1-lukas.bulwahn@gmail.com Signed-off-by:

Jakub Kicinski <kuba@kernel.org>

net/sched/cls_api.c

+3 −13

Original line number	Diff line number	Diff line
		@@ -2940,7 +2940,6 @@ static int tc_dump_chain(struct sk_buff skb, struct netlink_callback cb)
		struct tcf_chain *chain;
		long index_start;
		long index;
		u32 parent;
		int err;

		if (nlmsg_len(cb->nlh) < sizeof(*tcm))
		@@ -2955,13 +2954,6 @@ static int tc_dump_chain(struct sk_buff skb, struct netlink_callback cb)
		block = tcf_block_refcnt_get(net, tcm->tcm_block_index);
		if (!block)
		goto out;
		/* If we work with block index, q is NULL and parent value
		* will never be used in the following code. The check
		* in tcf_fill_node prevents it. However, compiler does not
		* see that far, so set parent to zero to silence the warning
		* about parent being uninitialized.
		*/
		parent = 0;
		} else {
		const struct Qdisc_class_ops *cops;
		struct net_device *dev;
		@@ -2971,13 +2963,11 @@ static int tc_dump_chain(struct sk_buff skb, struct netlink_callback cb)
		if (!dev)
		return skb->len;

		parent = tcm->tcm_parent;
		if (!parent) {
		if (!tcm->tcm_parent)
		q = dev->qdisc;
		parent = q->handle;
		} else {
		else
		q = qdisc_lookup(dev, TC_H_MAJ(tcm->tcm_parent));
		}

		if (!q)
		goto out;
		cops = q->ops->cl_ops;

Admin message