Skip to contentSkip to conversation

qemu-ga: ga_get_fd_handle(): abort if fd_counter overflows

PATCH Applied Luiz Capitulino 3 participants 4 messages Mar 22, 2013 – Mar 25, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qemu-ga: ga_get_fd_handle(): abort if fd_counter overflows

Today we reset fd_counter if it wraps, but it's better to abort() instead, as fd_counter should never reach INT64_MAX.

---
 qga/main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
qga/main.c +6 -2
index 74ef788..5f505a2 100644
@@ -889,9 +889,13 @@ int64_t ga_get_fd_handle(GAState *s, Error **errp)
     g_assert(!ga_is_frozen(s));
 
     handle = s->pstate.fd_counter++;
-    if (s->pstate.fd_counter < 0) {
-        s->pstate.fd_counter = 0;
+
+    /* This should never happen on a resonable timeframe, as guest-file-open
+     * would have to be issued 2^63 times */
+    if (s->pstate.fd_counter == INT64_MAX) {
+        abort();
     }
+
     if (!write_persistent_state(&s->pstate, s->pstate_filepath)) {
         error_setg(errp, "failed to commit persistent state to disk");
     }
Signature · 1 line
1.8.1.4
Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 lines · Luiz Capitulino

Today we reset fd_counter if it wraps, but it's better to abort() instead, as fd_counter should never reach INT64_MAX.

---
 qga/main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
qga/main.c +0 -0
index 74ef788..5f505a2 100644

qga/main.c int64_t ga_get_fd_handle(GAState *s, Error **errp) · line 893

Quoted 7 lines
qga/main.c +2 -2
@@ -889,9 +889,13 @@ int64_t ga_get_fd_handle(GAState *s, Error **errp)
     g_assert(!ga_is_frozen(s));
 
     handle = s->pstate.fd_counter++;
-    if (s->pstate.fd_counter < 0) {
-        s->pstate.fd_counter = 0;
+
+    /* This should never happen on a resonable timeframe, as guest-file-open

s/resonable/reasonable/

qga/main.c int64_t ga_get_fd_handle(GAState *s, Error **errp) · line 896

Quoted 3 lines
qga/main.c +3 -0
+     * would have to be issued 2^63 times */
+    if (s->pstate.fd_counter == INT64_MAX) {
+        abort();

Fix the typo, and you can add:

Signature · 2 lines
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org
#2 lore raw
Quoted 18 lines · On Fri, 22 Mar 2013 14:44:05 -0600 Eric Blake <[email protected]> wrote:
Quoted 17 lines · Luiz Capitulino

Today we reset fd_counter if it wraps, but it's better to abort() instead, as fd_counter should never reach INT64_MAX.

---
 qga/main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
qga/main.c +0 -0
index 74ef788..5f505a2 100644
@@ -889,9 +889,13 @@ int64_t ga_get_fd_handle(GAState *s, Error **errp)
     g_assert(!ga_is_frozen(s));
 
Quoted 7 lines

qga/main.c int64_t ga_get_fd_handle(GAState *s, Error **errp) · line 893

Quoted 5 lines
qga/main.c +2 -2
     handle = s->pstate.fd_counter++;
-    if (s->pstate.fd_counter < 0) {
-        s->pstate.fd_counter = 0;
+
+    /* This should never happen on a resonable timeframe, as guest-file-open

s/resonable/reasonable/

Michael, can you fix it for me?

Quoted 8 lines

qga/main.c int64_t ga_get_fd_handle(GAState *s, Error **errp) · line 896

Quoted 4 lines
qga/main.c +3 -0
+     * would have to be issued 2^63 times */
+    if (s->pstate.fd_counter == INT64_MAX) {
+        abort();

Fix the typo, and you can add:

Thanks!

Applied
#3 lore raw
In reply to Luiz Capitulino
Quoted 4 lines · Luiz Capitulino

Today we reset fd_counter if it wraps, but it's better to abort() instead, as fd_counter should never reach INT64_MAX.

Thanks, applied to qga branch with s/resonable/reasonable/ typo fix.

Quoted 27 lines
---
 qga/main.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
qga/main.c +6 -2
index 74ef788..5f505a2 100644
@@ -889,9 +889,13 @@ int64_t ga_get_fd_handle(GAState *s, Error **errp)
     g_assert(!ga_is_frozen(s));
 
     handle = s->pstate.fd_counter++;
-    if (s->pstate.fd_counter < 0) {
-        s->pstate.fd_counter = 0;
+
+    /* This should never happen on a resonable timeframe, as guest-file-open
+     * would have to be issued 2^63 times */
+    if (s->pstate.fd_counter == INT64_MAX) {
+        abort();
     }
+
     if (!write_persistent_state(&s->pstate, s->pstate_filepath)) {
         error_setg(errp, "failed to commit persistent state to disk");
     }
Signature · 1 line
1.8.1.4