File 0353-9pfs-drop-useless-check-in-pdu_free.patch of Package qemu-linux-user.10255

Overview Repositories Revisions Requests Users Attributes Meta

File 0353-9pfs-drop-useless-check-in-pdu_free.patch of Package qemu-linux-user.10255

From 01977c14ec6d815efa9729ed9f3b59dee0e5ecb3 Mon Sep 17 00:00:00 2001
From: Greg Kurz <groug@kaod.org>
Date: Mon, 17 Oct 2016 14:13:58 +0200
Subject: [PATCH] 9pfs: drop useless check in pdu_free()

Out of the three users of pdu_free(), none ever passes a NULL pointer to
this function.

Signed-off-by: Greg Kurz <groug@kaod.org>
(cherry picked from commit 6868a420c519d74926ea814d48f6ce9beda35b98)
[BR: Fix and/or infrastructure for BSC#1020427 CVE-2016-9602]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
 hw/9pfs/9p.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index 65e5e664e8..882994c21c 100644
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -606,16 +606,14 @@ V9fsPDU *pdu_alloc(V9fsState *s)
 
 void pdu_free(V9fsPDU *pdu)
 {
-    if (pdu) {
-        V9fsState *s = pdu->s;
-        /*
-         * Cancelled pdu are added back to the freelist
-         * by flush request .
-         */
-        if (!pdu->cancelled) {
-            QLIST_REMOVE(pdu, next);
-            QLIST_INSERT_HEAD(&s->free_list, pdu, next);
-        }
+    V9fsState *s = pdu->s;
+    /*
+     * Cancelled pdu are added back to the freelist
+     * by flush request .
+     */
+    if (!pdu->cancelled) {
+        QLIST_REMOVE(pdu, next);
+        QLIST_INSERT_HEAD(&s->free_list, pdu, next);
     }
 }

Places

File 0353-9pfs-drop-useless-check-in-pdu_free.patch of Package qemu-linux-user.10255

Places