hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-12-18 05:53:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make lagg creation more fault tolerant

Browse Source 
- Warn, don't exit, when SIOCSLAGGPORT returns an error.

When we exit with an error during lagg creation, a single
failed NIC (which no longer attaches) can prevent lagg
creation and other configuration, such as adding an IPv4
address, and thus leave a machine unreachable.

- Preserve non-EEXISTS errors for exit status from SIOCSLAGGPORT,
  in case scripts are looking for it. Hopefully this can be
  extended if other parts of ifconfig can allow a "soft" failure.

- Improve the warning message to mention what lagg and what
  member are problematic.

Reviewed by: jtl, glebius
Sponsored by: Netflix
Differential Revision:	https://reviews.freebsd.org/D15046
This commit is contained in:
Andrew Gallatin 2018-04-17 12:54:58 +00:00
parent 604f1c416c
commit 47528c67ef
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=332645
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/ifconfig/ifclone.c
View File

@ -181,7 +181,7 @@ static void
clone_Copt_cb(const char *optarg __unused)
{
list_cloners();
exit(0);
exit(exit_code);
}
static struct option clone_Copt = { .opt = "C", .opt_usage = "[-C]", .cb = clone_Copt_cb };

7
sbin/ifconfig/ifconfig.c
View File

@ -99,6 +99,7 @@ int printifname = 0;
int supmedia = 0;
int printkeys = 0; /* Print keying material for interfaces. */
int exit_code = 0;
/* Formatter Strings */
char *f_inet, *f_inet6, *f_ether, *f_addr;
@ -485,7 +486,7 @@ main(int argc, char *argv[])
errx(1, "%s: cloning name too long",
ifname);
ifconfig(argc, argv, 1, NULL);
exit(0);
exit(exit_code);
}
#ifdef JAIL
/*
@ -499,7 +500,7 @@ main(int argc, char *argv[])
errx(1, "%s: interface name too long",
ifname);
ifconfig(argc, argv, 0, NULL);
exit(0);
exit(exit_code);
}
#endif
errx(1, "interface %s does not exist", ifname);
@ -597,7 +598,7 @@ main(int argc, char *argv[])
freeifaddrs(ifap);
freeformat();
exit(0);
exit(exit_code);
}
static struct afswtch *afs = NULL;

1
sbin/ifconfig/ifconfig.h
View File

@ -136,6 +136,7 @@ extern int printkeys;
extern int newaddr;
extern int verbose;
extern int printifname;
extern int exit_code;
void setifcap(const char *, int value, int s, const struct afswtch *);

4
sbin/ifconfig/ifgroup.c
View File

@ -140,7 +140,7 @@ printgroup(const char *groupname)
if (ioctl(s, SIOCGIFGMEMB, (caddr_t)&ifgr) == -1) {
if (errno == EINVAL || errno == ENOTTY ||
errno == ENOENT)
exit(0);
exit(exit_code);
else
err(1, "SIOCGIFGMEMB");
}
@ -159,7 +159,7 @@ printgroup(const char *groupname)
}
free(ifgr.ifgr_groups);
exit(0);
exit(exit_code);
}
static struct cmd group_cmds[] = {

14
sbin/ifconfig/iflagg.c
View File

@ -41,9 +41,17 @@ setlaggport(const char *val, int d, int s, const struct afswtch *afp)
strlcpy(rp.rp_ifname, name, sizeof(rp.rp_ifname));
strlcpy(rp.rp_portname, val, sizeof(rp.rp_portname));
/* Don't choke if the port is already in this lagg. */
if (ioctl(s, SIOCSLAGGPORT, &rp) && errno != EEXIST)
err(1, "SIOCSLAGGPORT");
/*
* Do not exit with an error here. Doing so permits a
* failed NIC to take down an entire lagg.
*
* Don't error at all if the port is already in the lagg.
*/
if (ioctl(s, SIOCSLAGGPORT, &rp) && errno != EEXIST) {
warnx("%s %s: SIOCSLAGGPORT: %s",
name, val, strerror(errno));
exit_code = 1;
}
}
static void