| Message ID | 20210312141003.819108-3-groug@kaod.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | virtiofsd: Deal with empty filenames | expand |
On 3/12/21 8:10 AM, Greg Kurz wrote: > Both currently only return 0 or 1. > > Signed-off-by: Greg Kurz <groug@kaod.org> > --- > tools/virtiofsd/passthrough_ll.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c > index 27a6c636dcaf..f63016d35626 100644 > --- a/tools/virtiofsd/passthrough_ll.c > +++ b/tools/virtiofsd/passthrough_ll.c > @@ -221,17 +221,17 @@ static struct lo_inode *lo_find(struct lo_data *lo, struct stat *st, > static int xattr_map_client(const struct lo_data *lo, const char *client_name, > char **out_name); > > -static int is_dot_or_dotdot(const char *name) > +static bool is_dot_or_dotdot(const char *name) > { > return name[0] == '.' && > (name[1] == '\0' || (name[1] == '.' && name[2] == '\0')); > } > > /* Is `path` a single path component that is not "." or ".."? */ > -static int is_safe_path_component(const char *path) > +static bool is_safe_path_component(const char *path) > { > if (strchr(path, '/')) { > - return 0; > + return false; > } > > return !is_dot_or_dotdot(path); > Reviewed-by: Connor Kuehl <ckuehl@redhat.com>
On Fri, Mar 12, 2021 at 03:10:02PM +0100, Greg Kurz wrote: > Both currently only return 0 or 1. > > Signed-off-by: Greg Kurz <groug@kaod.org> Looks good to me. Reviewed-by: Vivek Goyal <vgoyal@redhat.com> Vivek > --- > tools/virtiofsd/passthrough_ll.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c > index 27a6c636dcaf..f63016d35626 100644 > --- a/tools/virtiofsd/passthrough_ll.c > +++ b/tools/virtiofsd/passthrough_ll.c > @@ -221,17 +221,17 @@ static struct lo_inode *lo_find(struct lo_data *lo, struct stat *st, > static int xattr_map_client(const struct lo_data *lo, const char *client_name, > char **out_name); > > -static int is_dot_or_dotdot(const char *name) > +static bool is_dot_or_dotdot(const char *name) > { > return name[0] == '.' && > (name[1] == '\0' || (name[1] == '.' && name[2] == '\0')); > } > > /* Is `path` a single path component that is not "." or ".."? */ > -static int is_safe_path_component(const char *path) > +static bool is_safe_path_component(const char *path) > { > if (strchr(path, '/')) { > - return 0; > + return false; > } > > return !is_dot_or_dotdot(path); > -- > 2.26.2 > > _______________________________________________ > Virtio-fs mailing list > Virtio-fs@redhat.com > https://listman.redhat.com/mailman/listinfo/virtio-fs
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c index 27a6c636dcaf..f63016d35626 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -221,17 +221,17 @@ static struct lo_inode *lo_find(struct lo_data *lo, struct stat *st, static int xattr_map_client(const struct lo_data *lo, const char *client_name, char **out_name); -static int is_dot_or_dotdot(const char *name) +static bool is_dot_or_dotdot(const char *name) { return name[0] == '.' && (name[1] == '\0' || (name[1] == '.' && name[2] == '\0')); } /* Is `path` a single path component that is not "." or ".."? */ -static int is_safe_path_component(const char *path) +static bool is_safe_path_component(const char *path) { if (strchr(path, '/')) { - return 0; + return false; } return !is_dot_or_dotdot(path);
Both currently only return 0 or 1. Signed-off-by: Greg Kurz <groug@kaod.org> --- tools/virtiofsd/passthrough_ll.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)