git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security: Mitigate possible privilege escalation via SG_IO ioctl (CVE-2011-4127,...
[libguestfs.git]
/
src
/
guestfs.c
diff --git
a/src/guestfs.c
b/src/guestfs.c
index
b2cf553
..
1fa3c0a
100644
(file)
--- a/
src/guestfs.c
+++ b/
src/guestfs.c
@@
-175,6
+175,13
@@
guestfs_close (guestfs_h *g)
return;
}
return;
}
+ if (g->trace) {
+ const char trace_msg[] = "close";
+
+ guestfs___call_callbacks_message (g, GUESTFS_EVENT_TRACE,
+ trace_msg, strlen (trace_msg));
+ }
+
debug (g, "closing guestfs handle %p (state %d)", g, g->state);
/* Try to sync if autosync flag is set. */
debug (g, "closing guestfs handle %p (state %d)", g, g->state);
/* Try to sync if autosync flag is set. */
@@
-216,7
+223,7
@@
guestfs_close (guestfs_h *g)
remove_tmpdir (g);
if (g->cmdline) {
remove_tmpdir (g);
if (g->cmdline) {
-
in
t i;
+
size_
t i;
for (i = 0; i < g->cmdline_size; ++i)
free (g->cmdline[i]);
for (i = 0; i < g->cmdline_size; ++i)
free (g->cmdline[i]);
@@
-571,6
+578,12
@@
guestfs_get_error_handler (guestfs_h *g, void **data_rtn)
return g->error_cb;
}
return g->error_cb;
}
+void
+guestfs_user_cancel (guestfs_h *g)
+{
+ g->user_cancel = 1;
+}
+
int
guestfs__set_verbose (guestfs_h *g, int v)
{
int
guestfs__set_verbose (guestfs_h *g, int v)
{
@@
-794,6
+807,19
@@
guestfs__get_attach_method (guestfs_h *g)
return ret;
}
return ret;
}
+int
+guestfs__set_pgroup (guestfs_h *g, int v)
+{
+ g->pgroup = !!v;
+ return 0;
+}
+
+int
+guestfs__get_pgroup (guestfs_h *g)
+{
+ return g->pgroup;
+}
+
/* Note the private data area is allocated lazily, since the vast
* majority of callers will never use it. This means g->pda is
* likely to be NULL.
/* Note the private data area is allocated lazily, since the vast
* majority of callers will never use it. This means g->pda is
* likely to be NULL.