From: Jean-Pierre André Date: Wed, 9 Feb 2022 14:59:10 +0000 (+0100) Subject: Fixed returning an error condition to ioctl(2) (#641) X-Git-Tag: fuse-3.11.0~11 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5128cee2dd0e54b74e9ea75dfc8cf70a866ee120;p=qemu-gpiodev%2Flibfuse.git Fixed returning an error condition to ioctl(2) (#641) When returning a negative error code by ->ioctl() to the high level interface, no error is propagated to the low level, and the reply message to the kernel is shown as successful. A negative result is however returned to kernel, so the kernel can detect the bad condition, but this appears to not be the case since kernel 5.15. The proposed fix is more in line with the usual processing of errors in fuse, taking into account that ioctl(2) always returns a non-negative value in the absence of errors. Co-authored-by: Jean-Pierre André --- diff --git a/ChangeLog.rst b/ChangeLog.rst index b97d61d..2dd8954 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,3 +1,5 @@ +* Fixed returning an error condition to ioctl(2) + libfuse 3.10.5 (2021-09-06) =========================== diff --git a/lib/fuse.c b/lib/fuse.c index f732470..91a4b70 100644 --- a/lib/fuse.c +++ b/lib/fuse.c @@ -4289,6 +4289,8 @@ static void fuse_lib_ioctl(fuse_req_t req, fuse_ino_t ino, unsigned int cmd, fuse_finish_interrupt(f, req, &d); free_path(f, ino, path); + if (err < 0) + goto err; fuse_reply_ioctl(req, err, out_buf, out_bufsz); goto out; err: