summary refs log tree commit diff stats
path: root/fsdev/virtfs-proxy-helper.c
diff options
context:
space:
mode:
authorDaniel Henrique Barboza <danielhb413@gmail.com>2020-01-20 15:11:39 +0100
committerGreg Kurz <groug@kaod.org>2020-01-20 15:11:39 +0100
commit846cf408a4c8055063f4a5a71ccf7ed030cdad30 (patch)
tree9443e549f1ec826d2d65c36f479c454a0c9c7122 /fsdev/virtfs-proxy-helper.c
parent841b8d099c462cd4282c4ced8c2a6512899fd8d9 (diff)
downloadfocaccia-qemu-846cf408a4c8055063f4a5a71ccf7ed030cdad30.tar.gz
focaccia-qemu-846cf408a4c8055063f4a5a71ccf7ed030cdad30.zip
9p: local: always return -1 on error in local_unlinkat_common
local_unlinkat_common() is supposed to always return -1 on error.
This is being done by jumps to the 'err_out' label, which is
a 'return ret' call, and 'ret' is initialized with -1.

Unfortunately there is a condition in which the function will
return 0 on error: in a case where flags == AT_REMOVEDIR, 'ret'
will be 0 when reaching

map_dirfd = openat_dir(...)

And, if map_dirfd == -1 and errno != ENOENT, the existing 'err_out'
jump will execute 'return ret', when ret is still set to zero
at that point.

This patch fixes it by changing all 'err_out' labels by
'return -1' calls, ensuring that the function will always
return -1 on error conditions. 'ret' can be left unintialized
since it's now being used just to store the result of 'unlinkat'
calls.

CC: Greg Kurz <groug@kaod.org>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
[groug: changed prefix in title to be "9p: local:"]
Signed-off-by: Greg Kurz <groug@kaod.org>
Diffstat (limited to 'fsdev/virtfs-proxy-helper.c')
0 files changed, 0 insertions, 0 deletions