Fixes from LGTM
Subsystems (2)
cover Fixes from LGTM
Ran LGTM (aka codeql) on iproute2 and it found a couple of obvious poitential issues.
Stephen Hemminger (2):
genl: fix duplicate include guard
tc: declaration hides parameter
genl/genl_utils.h | 4 ++-- 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 +++--- 8 files changed, 27 insertions(+), 27 deletions(-)
Signature · 1 line
2.35.1
PATCH 1/2 genl: fix duplicate include guard
The include guard should be unique per file.
Signed-off-by Stephen Hemminger <[email protected]>
--- genl/genl_utils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
genl/genl_utils.h +2 -2
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _TC_UTIL_H_ -#define _TC_UTIL_H_ 1 +#ifndef _GENL_UTILS_H_ +#define _GENL_UTILS_H_ 1#include <linux/genetlink.h> #include "utils.h"
Signature · 1 line
2.35.1
PATCH 2/2 tc: declaration hides parameter
In reply to Stephen HemmingerIn 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 <[email protected]>
--- 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(-)
tc/f_basic.c +3 -3
@@ -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)) {
tc/f_bpf.c +3 -3
@@ -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 ;
tc/f_flower.c +7 -7
@@ -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,
tc/f_fw.c +3 -3
@@ -70,14 +70,14 @@ static int fw_parse_opt(struct filter_util *qu, char *handle, int argc, char **awhile (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)) {
tc/f_matchall.c +3 -3
@@ -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)) {
tc/f_route.c +3 -3
@@ -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)) {
tc/f_rsvp.c +3 -3
@@ -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;
Signature · 1 line
2.35.1