| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220617171953.38720-3-stephen@networkplumber.org>
Date: Fri, 17 Jun 2022 10:19:53 -0700
From: Stephen Hemminger <stephen@...workplumber.org>
To: netdev@...r.kernel.org
Cc: Stephen Hemminger <stephen@...workplumber.org>
Subject: [PATCH iproute2 2/2] tc: declaration hides parameter
In several places (code reuse?), the variable handle is a parameter
to the function, but then is defined inside basic block for classid.
Signed-off-by: Stephen Hemminger <stephen@...workplumber.org>
---
tc/f_basic.c | 6 +++---
tc/f_bpf.c | 6 +++---
tc/f_flower.c | 14 +++++++-------
tc/f_fw.c | 6 +++---
tc/f_matchall.c | 6 +++---
tc/f_route.c | 6 +++---
tc/f_rsvp.c | 6 +++---
7 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/tc/f_basic.c b/tc/f_basic.c
index 7b19cea6e87e..9a60758e803e 100644
--- a/tc/f_basic.c
+++ b/tc/f_basic.c
@@ -70,14 +70,14 @@ static int basic_parse_opt(struct filter_util *qu, char *handle,
continue;
} else if (matches(*argv, "classid") == 0 ||
strcmp(*argv, "flowid") == 0) {
- unsigned int handle;
+ unsigned int classid;
NEXT_ARG();
- if (get_tc_classid(&handle, *argv)) {
+ if (get_tc_classid(&classid, *argv)) {
fprintf(stderr, "Illegal \"classid\"\n");
return -1;
}
- addattr_l(n, MAX_MSG, TCA_BASIC_CLASSID, &handle, 4);
+ addattr_l(n, MAX_MSG, TCA_BASIC_CLASSID, &classid, 4);
} else if (matches(*argv, "action") == 0) {
NEXT_ARG();
if (parse_action(&argc, &argv, TCA_BASIC_ACT, n)) {
diff --git a/tc/f_bpf.c b/tc/f_bpf.c
index fa3552aefffd..96e4576aa2f8 100644
--- a/tc/f_bpf.c
+++ b/tc/f_bpf.c
@@ -126,14 +126,14 @@ opt_bpf:
bpf_uds_name = cfg.uds;
} else if (matches(*argv, "classid") == 0 ||
matches(*argv, "flowid") == 0) {
- unsigned int handle;
+ unsigned int classid;
NEXT_ARG();
- if (get_tc_classid(&handle, *argv)) {
+ if (get_tc_classid(&classid, *argv)) {
fprintf(stderr, "Illegal \"classid\"\n");
return -1;
}
- addattr32(n, MAX_MSG, TCA_BPF_CLASSID, handle);
+ addattr32(n, MAX_MSG, TCA_BPF_CLASSID, classid);
} else if (matches(*argv, "direct-action") == 0 ||
matches(*argv, "da") == 0) {
bpf_flags |= TCA_BPF_FLAG_ACT_DIRECT;
diff --git a/tc/f_flower.c b/tc/f_flower.c
index 805ca6718fa7..622ec321f310 100644
--- a/tc/f_flower.c
+++ b/tc/f_flower.c
@@ -1452,17 +1452,17 @@ static int flower_parse_opt(struct filter_util *qu, char *handle,
while (argc > 0) {
if (matches(*argv, "classid") == 0 ||
matches(*argv, "flowid") == 0) {
- unsigned int handle;
+ unsigned int classid;
NEXT_ARG();
- ret = get_tc_classid(&handle, *argv);
+ ret = get_tc_classid(&classid, *argv);
if (ret) {
fprintf(stderr, "Illegal \"classid\"\n");
return -1;
}
- addattr_l(n, MAX_MSG, TCA_FLOWER_CLASSID, &handle, 4);
+ addattr_l(n, MAX_MSG, TCA_FLOWER_CLASSID, &classid, 4);
} else if (matches(*argv, "hw_tc") == 0) {
- unsigned int handle;
+ unsigned int classid;
__u32 tc;
char *end;
@@ -1476,10 +1476,10 @@ static int flower_parse_opt(struct filter_util *qu, char *handle,
fprintf(stderr, "TC index exceeds max range\n");
return -1;
}
- handle = TC_H_MAKE(TC_H_MAJ(t->tcm_parent),
+ classid = TC_H_MAKE(TC_H_MAJ(t->tcm_parent),
TC_H_MIN(tc + TC_H_MIN_PRIORITY));
- addattr_l(n, MAX_MSG, TCA_FLOWER_CLASSID, &handle,
- sizeof(handle));
+ addattr_l(n, MAX_MSG, TCA_FLOWER_CLASSID, &classid,
+ sizeof(classid));
} else if (matches(*argv, "ip_flags") == 0) {
NEXT_ARG();
ret = flower_parse_matching_flags(*argv,
diff --git a/tc/f_fw.c b/tc/f_fw.c
index 688364f55d1d..3c6ea93d2944 100644
--- a/tc/f_fw.c
+++ b/tc/f_fw.c
@@ -70,14 +70,14 @@ static int fw_parse_opt(struct filter_util *qu, char *handle, int argc, char **a
while (argc > 0) {
if (matches(*argv, "classid") == 0 ||
matches(*argv, "flowid") == 0) {
- unsigned int handle;
+ unsigned int classid;
NEXT_ARG();
- if (get_tc_classid(&handle, *argv)) {
+ if (get_tc_classid(&classid, *argv)) {
fprintf(stderr, "Illegal \"classid\"\n");
return -1;
}
- addattr_l(n, 4096, TCA_FW_CLASSID, &handle, 4);
+ addattr_l(n, 4096, TCA_FW_CLASSID, &classid, 4);
} else if (matches(*argv, "police") == 0) {
NEXT_ARG();
if (parse_police(&argc, &argv, TCA_FW_POLICE, n)) {
diff --git a/tc/f_matchall.c b/tc/f_matchall.c
index 253ed5ce42e0..231d749e1f43 100644
--- a/tc/f_matchall.c
+++ b/tc/f_matchall.c
@@ -63,14 +63,14 @@ static int matchall_parse_opt(struct filter_util *qu, char *handle,
while (argc > 0) {
if (matches(*argv, "classid") == 0 ||
strcmp(*argv, "flowid") == 0) {
- unsigned int handle;
+ unsigned int classid;
NEXT_ARG();
- if (get_tc_classid(&handle, *argv)) {
+ if (get_tc_classid(&classid, *argv)) {
fprintf(stderr, "Illegal \"classid\"\n");
return -1;
}
- addattr_l(n, MAX_MSG, TCA_MATCHALL_CLASSID, &handle, 4);
+ addattr_l(n, MAX_MSG, TCA_MATCHALL_CLASSID, &classid, 4);
} else if (matches(*argv, "action") == 0) {
NEXT_ARG();
if (parse_action(&argc, &argv, TCA_MATCHALL_ACT, n)) {
diff --git a/tc/f_route.c b/tc/f_route.c
index 31fa96a0565e..ad516b382ac0 100644
--- a/tc/f_route.c
+++ b/tc/f_route.c
@@ -91,14 +91,14 @@ static int route_parse_opt(struct filter_util *qu, char *handle, int argc, char
fh |= (0x8000|id)<<16;
} else if (matches(*argv, "classid") == 0 ||
strcmp(*argv, "flowid") == 0) {
- unsigned int handle;
+ unsigned int classid;
NEXT_ARG();
- if (get_tc_classid(&handle, *argv)) {
+ if (get_tc_classid(&classid, *argv)) {
fprintf(stderr, "Illegal \"classid\"\n");
return -1;
}
- addattr_l(n, 4096, TCA_ROUTE4_CLASSID, &handle, 4);
+ addattr_l(n, 4096, TCA_ROUTE4_CLASSID, &classid, 4);
} else if (matches(*argv, "police") == 0) {
NEXT_ARG();
if (parse_police(&argc, &argv, TCA_ROUTE4_POLICE, n)) {
diff --git a/tc/f_rsvp.c b/tc/f_rsvp.c
index 388e9ee59ad3..0211c3f5e74b 100644
--- a/tc/f_rsvp.c
+++ b/tc/f_rsvp.c
@@ -230,14 +230,14 @@ static int rsvp_parse_opt(struct filter_util *qu, char *handle, int argc,
pinfo_ok++;
} else if (matches(*argv, "classid") == 0 ||
strcmp(*argv, "flowid") == 0) {
- unsigned int handle;
+ unsigned int classid;
NEXT_ARG();
- if (get_tc_classid(&handle, *argv)) {
+ if (get_tc_classid(&classid, *argv)) {
fprintf(stderr, "Illegal \"classid\"\n");
return -1;
}
- addattr_l(n, 4096, TCA_RSVP_CLASSID, &handle, 4);
+ addattr_l(n, 4096, TCA_RSVP_CLASSID, &classid, 4);
} else if (strcmp(*argv, "tunnelid") == 0) {
unsigned int tid;
--
2.35.1
Powered by blists - more mailing lists