| Message ID | 20200625114657.49115-1-zeil@yandex-team.ru |
|---|---|
| State | Superseded |
| Delegated to: | stephen hemminger |
| Headers | show |
| Series | [iproute2-next] lib: fix checking of returned file handle size for cgroup | expand |
On 6/25/20 5:46 AM, Dmitry Yakunin wrote: > Before this patch check is happened only in case when we try to find > cgroup at cgroup2 mount point. > needs to go to main branch with Fixes: d5e6ee0dac64 ("ss: introduce cgroup2 cache and helper functions") > Signed-off-by: Dmitry Yakunin <zeil@yandex-team.ru> > --- > lib/fs.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/lib/fs.c b/lib/fs.c > index e265fc0..4b90a70 100644 > --- a/lib/fs.c > +++ b/lib/fs.c > @@ -148,10 +148,10 @@ __u64 get_cgroup2_id(const char *path) > strerror(errno)); > goto out; > } > - if (fhp->handle_bytes != sizeof(__u64)) { > - fprintf(stderr, "Invalid size of cgroup2 ID\n"); > - goto out; > - } > + } > + if (fhp->handle_bytes != sizeof(__u64)) { > + fprintf(stderr, "Invalid size of cgroup2 ID\n"); > + goto out; > } > > memcpy(cg_id.bytes, fhp->f_handle, sizeof(__u64)); >
diff --git a/lib/fs.c b/lib/fs.c index e265fc0..4b90a70 100644 --- a/lib/fs.c +++ b/lib/fs.c @@ -148,10 +148,10 @@ __u64 get_cgroup2_id(const char *path) strerror(errno)); goto out; } - if (fhp->handle_bytes != sizeof(__u64)) { - fprintf(stderr, "Invalid size of cgroup2 ID\n"); - goto out; - } + } + if (fhp->handle_bytes != sizeof(__u64)) { + fprintf(stderr, "Invalid size of cgroup2 ID\n"); + goto out; } memcpy(cg_id.bytes, fhp->f_handle, sizeof(__u64));
Before this patch check is happened only in case when we try to find cgroup at cgroup2 mount point. Signed-off-by: Dmitry Yakunin <zeil@yandex-team.ru> --- lib/fs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)