proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-07-27 10:51:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

userns: handle delayed write errors at fclose

Browse Source 
As Kees pointed out, write() errors can be delayed and returned as
close() errors.  So don't ignore error on close when writing the
userns id mapping.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Serge Hallyn 2013-03-04 11:55:16 -06:00
parent dba104c82e
commit e4ccd113dc
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lxc/conf.c
View File

@ -2447,7 +2447,7 @@ int lxc_assign_network(struct lxc_list *network, pid_t pid)
int add_id_mapping(enum idtype idtype, pid_t pid, uid_t host_start, uid_t ns_start, int range) int add_id_mapping(enum idtype idtype, pid_t pid, uid_t host_start, uid_t ns_start, int range)
{ {
char path[PATH_MAX]; char path[PATH_MAX];
int ret; int ret, closeret;
FILE *f; FILE *f;
ret = snprintf(path, PATH_MAX, "/proc/%d/%cid_map", pid, idtype == ID_TYPE_UID ? 'u' : 'g'); ret = snprintf(path, PATH_MAX, "/proc/%d/%cid_map", pid, idtype == ID_TYPE_UID ? 'u' : 'g');
@ -2462,9 +2462,11 @@ int add_id_mapping(enum idtype idtype, pid_t pid, uid_t host_start, uid_t ns_sta
} }
ret = fprintf(f, "%d %d %d", ns_start, host_start, range); ret = fprintf(f, "%d %d %d", ns_start, host_start, range);
if (ret < 0) if (ret < 0)
perror("write"); SYSERROR("writing id mapping");
fclose(f); closeret = fclose(f);
return ret < 0 ? ret : 0; if (closeret)
SYSERROR("writing id mapping");
return ret < 0 ? ret : closeret;
} }
int lxc_map_ids(struct lxc_list *idmap, pid_t pid) int lxc_map_ids(struct lxc_list *idmap, pid_t pid)