mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-09-05 01:19:32 +00:00
Code Issues Releases Wiki Activity

network: send ifindex for unpriv networks

Browse Source 
We use the ifindex as an indicator that liblxc created the network so let's
record it for the unprivileged case as well.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner
2017-08-27 04:59:57 +02:00
parent c92dfebd9e
commit 0cffb6769d
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lxc/conf.c
View File

@@ -3274,6 +3274,7 @@ bool lxc_delete_network(struct lxc_handler *handler)
static int unpriv_assign_nic(const char *lxcpath, char *lxcname, static int unpriv_assign_nic(const char *lxcpath, char *lxcname,
struct lxc_netdev *netdev, pid_t pid) struct lxc_netdev *netdev, pid_t pid)
{ {
int ret;
pid_t child; pid_t child;
int bytes, pipefd[2]; int bytes, pipefd[2];
char *token, *saveptr = NULL; char *token, *saveptr = NULL;
@@ -3387,6 +3388,17 @@ static int unpriv_assign_nic(const char *lxcpath, char *lxcname,
return -1; return -1;
} }
/* fill netdev->veth_attr.pair field */
token = strtok_r(NULL, ":", &saveptr);
if (!token)
return -1;
ret = lxc_safe_int(token, &netdev->ifindex);
if (ret < 0) {
ERROR("Failed to parse ifindex for network device \"%s\"", netdev->name);
return -1;
}
return 0; return 0;
} }

10
src/lxc/lxc_user_nic.c
View File

@@ -767,7 +767,8 @@ again:
goto again; goto again;
} }
static char *lxc_secure_rename_in_ns(int pid, char *oldname, char *newname) static char *lxc_secure_rename_in_ns(int pid, char *oldname, char *newname,
int *ifidx)
{ {
int ret; int ret;
uid_t ruid, suid, euid; uid_t ruid, suid, euid;
@@ -850,6 +851,7 @@ static char *lxc_secure_rename_in_ns(int pid, char *oldname, char *newname)
/* Allocation failure for strdup() is checked below. */ /* Allocation failure for strdup() is checked below. */
name = strdup(ifname); name = strdup(ifname);
string_ret = name; string_ret = name;
*ifidx = ifindex;
do_full_cleanup: do_full_cleanup:
ret = setresuid(ruid, euid, suid); ret = setresuid(ruid, euid, suid);
@@ -943,7 +945,7 @@ struct user_nic_args {
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int fd, n, pid, ret; int fd, ifindex, n, pid, ret;
char *me, *newname; char *me, *newname;
char *cnic = NULL, *nicname = NULL; char *cnic = NULL, *nicname = NULL;
struct alloted_s *alloted = NULL; struct alloted_s *alloted = NULL;
@@ -1018,7 +1020,7 @@ int main(int argc, char *argv[])
} }
/* Now rename the link. */ /* Now rename the link. */
newname = lxc_secure_rename_in_ns(pid, cnic, args.veth_name); newname = lxc_secure_rename_in_ns(pid, cnic, args.veth_name, &ifindex);
if (!newname) { if (!newname) {
usernic_error("%s", "Failed to rename the link\n"); usernic_error("%s", "Failed to rename the link\n");
ret = lxc_netdev_delete_by_name(cnic); ret = lxc_netdev_delete_by_name(cnic);
@@ -1029,7 +1031,7 @@ int main(int argc, char *argv[])
} }
/* Write the name of the interface pair to the stdout: eth0:veth9MT2L4 */ /* Write the name of the interface pair to the stdout: eth0:veth9MT2L4 */
fprintf(stdout, "%s:%s\n", newname, nicname); fprintf(stdout, "%s:%s:%d\n", newname, nicname, ifindex);
free(newname); free(newname);
free(nicname); free(nicname);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);