| Message ID | 62e8103d249fcdb03ad6c706840579a075333398.1646850707.git.qemu_oss@crudebyte.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | 9pfs: fix 'Twalk' protocol violation | expand |
On Wed, 9 Mar 2022 13:18:50 +0100 Christian Schoenebeck <qemu_oss@crudebyte.com> wrote: > Expect ENOENT Rlerror response when trying to walk to a > non-existent directory. > > Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > tests/qtest/virtio-9p-test.c | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c > index 01ca076afe..22bdd74bc1 100644 > --- a/tests/qtest/virtio-9p-test.c > +++ b/tests/qtest/virtio-9p-test.c > @@ -606,6 +606,25 @@ static uint32_t do_walk(QVirtio9P *v9p, const char *path) > return fid; > } > > +/* utility function: walk to requested dir and expect passed error response */ > +static void do_walk_expect_error(QVirtio9P *v9p, const char *path, uint32_t err) > +{ > + char **wnames; > + P9Req *req; > + uint32_t _err; > + const uint32_t fid = genfid(); > + > + int nwnames = split(path, "/", &wnames); > + > + req = v9fs_twalk(v9p, 0, fid, nwnames, wnames, 0); > + v9fs_req_wait_for_reply(req, NULL); > + v9fs_rlerror(req, &_err); > + > + g_assert_cmpint(_err, ==, err); > + > + split_free(&wnames); > +} > + > static void fs_version(void *obj, void *data, QGuestAllocator *t_alloc) > { > alloc = t_alloc; > @@ -974,6 +993,15 @@ static void fs_walk_no_slash(void *obj, void *data, QGuestAllocator *t_alloc) > g_free(wnames[0]); > } > > +static void fs_walk_nonexistent(void *obj, void *data, QGuestAllocator *t_alloc) > +{ > + QVirtio9P *v9p = obj; > + alloc = t_alloc; > + > + do_attach(v9p); > + do_walk_expect_error(v9p, "non-existent", ENOENT); > +} > + > static void fs_walk_dotdot(void *obj, void *data, QGuestAllocator *t_alloc) > { > QVirtio9P *v9p = obj; > @@ -1409,6 +1437,8 @@ static void register_virtio_9p_test(void) > &opts); > qos_add_test("synth/walk/dotdot_from_root", "virtio-9p", > fs_walk_dotdot, &opts); > + qos_add_test("synth/walk/non_existent", "virtio-9p", fs_walk_nonexistent, > + &opts); > qos_add_test("synth/lopen/basic", "virtio-9p", fs_lopen, &opts); > qos_add_test("synth/write/basic", "virtio-9p", fs_write, &opts); > qos_add_test("synth/flush/success", "virtio-9p", fs_flush_success,
diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c index 01ca076afe..22bdd74bc1 100644 --- a/tests/qtest/virtio-9p-test.c +++ b/tests/qtest/virtio-9p-test.c @@ -606,6 +606,25 @@ static uint32_t do_walk(QVirtio9P *v9p, const char *path) return fid; } +/* utility function: walk to requested dir and expect passed error response */ +static void do_walk_expect_error(QVirtio9P *v9p, const char *path, uint32_t err) +{ + char **wnames; + P9Req *req; + uint32_t _err; + const uint32_t fid = genfid(); + + int nwnames = split(path, "/", &wnames); + + req = v9fs_twalk(v9p, 0, fid, nwnames, wnames, 0); + v9fs_req_wait_for_reply(req, NULL); + v9fs_rlerror(req, &_err); + + g_assert_cmpint(_err, ==, err); + + split_free(&wnames); +} + static void fs_version(void *obj, void *data, QGuestAllocator *t_alloc) { alloc = t_alloc; @@ -974,6 +993,15 @@ static void fs_walk_no_slash(void *obj, void *data, QGuestAllocator *t_alloc) g_free(wnames[0]); } +static void fs_walk_nonexistent(void *obj, void *data, QGuestAllocator *t_alloc) +{ + QVirtio9P *v9p = obj; + alloc = t_alloc; + + do_attach(v9p); + do_walk_expect_error(v9p, "non-existent", ENOENT); +} + static void fs_walk_dotdot(void *obj, void *data, QGuestAllocator *t_alloc) { QVirtio9P *v9p = obj; @@ -1409,6 +1437,8 @@ static void register_virtio_9p_test(void) &opts); qos_add_test("synth/walk/dotdot_from_root", "virtio-9p", fs_walk_dotdot, &opts); + qos_add_test("synth/walk/non_existent", "virtio-9p", fs_walk_nonexistent, + &opts); qos_add_test("synth/lopen/basic", "virtio-9p", fs_lopen, &opts); qos_add_test("synth/write/basic", "virtio-9p", fs_write, &opts); qos_add_test("synth/flush/success", "virtio-9p", fs_flush_success,
Expect ENOENT Rlerror response when trying to walk to a non-existent directory. Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com> --- tests/qtest/virtio-9p-test.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)