proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-08-15 09:33:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ip link: Fix crash on older kernels when show VF dev

Browse Source 
The issue was caused that ifla_vf_rate does not exist on
older kernels and should be checked if it exists as nested attr.

Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
Reported-by: William Dauchy <william@gandi.net>
Tested-by: William Dauchy <william@gandi.net>
This commit is contained in:
Vadim Kochan 2015-01-09 21:24:31 +02:00 committed by Stephen Hemminger
parent 564663b4ca
commit 8c29ae7cc2
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ip/ipaddress.c
View File

@ -282,11 +282,10 @@ static void print_vfinfo(FILE *fp, struct rtattr *vfinfo)
{ {
struct ifla_vf_mac *vf_mac; struct ifla_vf_mac *vf_mac;
struct ifla_vf_vlan *vf_vlan; struct ifla_vf_vlan *vf_vlan;
struct ifla_vf_rate *vf_rate;
struct ifla_vf_tx_rate *vf_tx_rate; struct ifla_vf_tx_rate *vf_tx_rate;
struct ifla_vf_spoofchk *vf_spoofchk; struct ifla_vf_spoofchk *vf_spoofchk;
struct ifla_vf_link_state *vf_linkstate; struct ifla_vf_link_state *vf_linkstate;
struct rtattr *vf[IFLA_VF_MAX+1]; struct rtattr *vf[IFLA_VF_MAX + 1] = {};
struct rtattr *tmp; struct rtattr *tmp;
SPRINT_BUF(b1); SPRINT_BUF(b1);
@ -300,7 +299,6 @@ static void print_vfinfo(FILE *fp, struct rtattr *vfinfo)
vf_mac = RTA_DATA(vf[IFLA_VF_MAC]); vf_mac = RTA_DATA(vf[IFLA_VF_MAC]);
vf_vlan = RTA_DATA(vf[IFLA_VF_VLAN]); vf_vlan = RTA_DATA(vf[IFLA_VF_VLAN]);
vf_tx_rate = RTA_DATA(vf[IFLA_VF_TX_RATE]); vf_tx_rate = RTA_DATA(vf[IFLA_VF_TX_RATE]);
vf_rate = RTA_DATA(vf[IFLA_VF_RATE]);
/* Check if the spoof checking vf info type is supported by /* Check if the spoof checking vf info type is supported by
* this kernel. * this kernel.
@ -336,10 +334,16 @@ static void print_vfinfo(FILE *fp, struct rtattr *vfinfo)
fprintf(fp, ", qos %d", vf_vlan->qos); fprintf(fp, ", qos %d", vf_vlan->qos);
if (vf_tx_rate->rate) if (vf_tx_rate->rate)
fprintf(fp, ", tx rate %d (Mbps)", vf_tx_rate->rate); fprintf(fp, ", tx rate %d (Mbps)", vf_tx_rate->rate);
if (vf_rate->max_tx_rate)
fprintf(fp, ", max_tx_rate %dMbps", vf_rate->max_tx_rate); if (vf[IFLA_VF_RATE]) {
if (vf_rate->min_tx_rate) struct ifla_vf_rate *vf_rate = RTA_DATA(vf[IFLA_VF_RATE]);
fprintf(fp, ", min_tx_rate %dMbps", vf_rate->min_tx_rate);
if (vf_rate->max_tx_rate)
fprintf(fp, ", max_tx_rate %dMbps", vf_rate->max_tx_rate);
if (vf_rate->min_tx_rate)
fprintf(fp, ", min_tx_rate %dMbps", vf_rate->min_tx_rate);
}
if (vf_spoofchk && vf_spoofchk->setting != -1) { if (vf_spoofchk && vf_spoofchk->setting != -1) {
if (vf_spoofchk->setting) if (vf_spoofchk->setting)
fprintf(fp, ", spoof checking on"); fprintf(fp, ", spoof checking on");