Skip to content

Commit

Permalink
util/error: Save errno from clobbering
Browse files Browse the repository at this point in the history
There may be calls to error_setg() and especially error_setg_errno()
which blindly (and until now wrongly) assume these functions not to
clobber errno (e.g., they pass errno to error_setg_errno() and return
-errno afterwards). Instead of trying to find and fix all of these
constructs, just make sure error_setg() and error_setg_errno() indeed do
not clobber errno.

Suggested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
  • Loading branch information
XanClic authored and kevmw committed Nov 28, 2013
1 parent 5a37b60 commit b276d24
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions util/error.c
Expand Up @@ -27,6 +27,7 @@ void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...)
{
Error *err;
va_list ap;
int saved_errno = errno;

if (errp == NULL) {
return;
Expand All @@ -41,6 +42,8 @@ void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...)
err->err_class = err_class;

*errp = err;

errno = saved_errno;
}

void error_set_errno(Error **errp, int os_errno, ErrorClass err_class,
Expand All @@ -49,6 +52,7 @@ void error_set_errno(Error **errp, int os_errno, ErrorClass err_class,
Error *err;
char *msg1;
va_list ap;
int saved_errno = errno;

if (errp == NULL) {
return;
Expand All @@ -69,6 +73,8 @@ void error_set_errno(Error **errp, int os_errno, ErrorClass err_class,
err->err_class = err_class;

*errp = err;

errno = saved_errno;
}

void error_setg_file_open(Error **errp, int os_errno, const char *filename)
Expand Down

0 comments on commit b276d24

Please sign in to comment.