| 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
| ||
|
Date: Wed, 3 Apr 2024 11:20:21 +0800
From: renmingshuai <renmingshuai@...wei.com>
To: <netdev@...r.kernel.org>, <stephen@...workplumber.org>,
<dsahern@...il.com>
CC: <renmingshuai@...wei.com>, <yanan@...wei.com>, <liaichun@...wei.com>
Subject: [PATCH] iplink: add an option to set IFLA_EXT_MASK attribute
Kernel has add IFLA_EXT_MASK attribute for indicating that certain
extended ifinfo values are requested by the user application. The ip
link show cmd always request VFs extended ifinfo.
RTM_GETLINK for greater than about 220 VFs truncates IFLA_VFINFO_LIST
due to the maximum reach of nlattr's nla_len being exceeded.
As a result, ip link show command only show the truncated VFs info sucn as:
#ip link show dev eth0
1: eth0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 ...
link/ether ...
vf 0 link/ether 00:00:00:00:00:00 brd ff:ff:ff:ff:ff:ff ...
Truncated VF list: eth0
Add an option to set IFLA_EXT_MASK attribute and users can choose to
show the extended ifinfo or not.
Signed-off-by: Mingshuai Ren <renmingshuai@...wei.com>
---
ip/ip_common.h | 1 +
ip/ipaddress.c | 23 +++++++++++++++++------
ip/iplink.c | 5 +++--
man/man8/ip-link.8.in | 7 +++++++
4 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/ip/ip_common.h b/ip/ip_common.h
index b65c2b41..d6a36845 100644
--- a/ip/ip_common.h
+++ b/ip/ip_common.h
@@ -30,6 +30,7 @@ struct link_filter {
int target_nsid;
bool have_proto;
int proto;
+ bool ext_info;
};
const char *get_ip_lib_dir(void);
diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index e536912f..b533c0fc 100644
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -2035,9 +2035,11 @@ static int iplink_filter_req(struct nlmsghdr *nlh, int reqlen)
filt_mask = RTEXT_FILTER_VF;
if (!show_stats)
filt_mask |= RTEXT_FILTER_SKIP_STATS;
- err = addattr32(nlh, reqlen, IFLA_EXT_MASK, filt_mask);
- if (err)
- return err;
+ if (filter.ext_info) {
+ err = addattr32(nlh, reqlen, IFLA_EXT_MASK, filt_mask);
+ if (err)
+ return err;
+ }
if (filter.master) {
err = addattr32(nlh, reqlen, IFLA_MASTER, filter.master);
@@ -2075,8 +2077,8 @@ static int ipaddr_link_get(int index, struct nlmsg_chain *linfo)
if (!show_stats)
filt_mask |= RTEXT_FILTER_SKIP_STATS;
-
- addattr32(&req.n, sizeof(req), IFLA_EXT_MASK, filt_mask);
+ if (filter.ext_info)
+ addattr32(&req.n, sizeof(req), IFLA_EXT_MASK, filt_mask);
if (rtnl_talk(&rth, &req.n, &answer) < 0) {
perror("Cannot send link request");
@@ -2139,6 +2141,7 @@ static int ipaddr_list_flush_or_save(int argc, char **argv, int action)
ipaddr_reset_filter(oneline, 0);
filter.showqueue = 1;
filter.family = preferred_family;
+ filter.ext_info = true;
if (action == IPADD_FLUSH) {
if (argc <= 0) {
@@ -2221,6 +2224,14 @@ static int ipaddr_list_flush_or_save(int argc, char **argv, int action)
invarg("\"proto\" value is invalid\n", *argv);
filter.have_proto = true;
filter.proto = proto;
+ } else if (strcmp(*argv, "extinfo") == 0) {
+ NEXT_ARG();
+ if (strcmp(*argv, "on") == 0)
+ filter.ext_info = true;
+ else if (strcmp(*argv, "off") == 0)
+ filter.ext_info = false;
+ else
+ invarg("must be \"on\" or \"off\"", "extinfo");
} else {
if (strcmp(*argv, "dev") == 0)
NEXT_ARG();
@@ -2274,7 +2285,7 @@ static int ipaddr_list_flush_or_save(int argc, char **argv, int action)
* the link device
*/
if (filter_dev && filter.group == -1 && do_link == 1) {
- if (iplink_get(filter_dev, RTEXT_FILTER_VF) < 0) {
+ if (iplink_get(filter_dev, filter.ext_info ? RTEXT_FILTER_VF : 0) < 0) {
perror("Cannot send link get request");
delete_json_obj();
exit(1);
diff --git a/ip/iplink.c b/ip/iplink.c
index 95314af5..97f26e5d 100644
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -111,7 +111,7 @@ void iplink_usage(void)
" [ gro_max_size BYTES ] [ gro_ipv4_max_size BYTES ]\n"
"\n"
" ip link show [ DEVICE | group GROUP ] [up] [master DEV] [vrf NAME] [type TYPE]\n"
- " [nomaster]\n"
+ " [nomaster] [ extinfo { on | off } ]\n"
"\n"
" ip link xstats type TYPE [ ARGS ]\n"
"\n"
@@ -1115,7 +1115,8 @@ int iplink_get(char *name, __u32 filt_mask)
if (!show_stats)
filt_mask |= RTEXT_FILTER_SKIP_STATS;
- addattr32(&req.n, sizeof(req), IFLA_EXT_MASK, filt_mask);
+ if (filt_mask)
+ addattr32(&req.n, sizeof(req), IFLA_EXT_MASK, filt_mask);
if (rtnl_talk(&rth, &req.n, &answer) < 0)
return -2;
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
index 31e2d7f0..c2a59ff7 100644
--- a/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@ -203,6 +203,7 @@ ip-link \- network device configuration
.B vrf
.IR NAME " ] ["
.BR nomaster " ]"
+.RB "[ " extinfo " { " on " | " off " } ]"
.ti -8
.B ip link xstats
@@ -2898,6 +2899,10 @@ output.
.B nomaster
only show devices with no master
+.TP
+.BR "extinfo on" or "extinfo off"
+specifies whether to show the extended ifinfo.
+
.SS ip link xstats - display extended statistics
.TP
--
2.33.0
Powered by blists - more mailing lists