>From 23a521411db754560687249f2457006c969a6340 Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Tue, 21 Jun 2011 17:20:27 +0200 Subject: [PATCH] xen: blkback, blktap: Fix potential resource leak When picking up the changes for CVE-2010-4247 I missed that there actually is a follow-up patch (that was not mentioned in the CVE) which prevents resource leak in that special case. Signed-off-by: Keir Fraser BugLink: http://bugs.launchpad.net/bugs/800254 (picked from http://xenbits.xen.org/hg/linux-2.6.18-xen.hg/rev/5012c470f875) Signed-off-by: Stefan Bader --- drivers/xen/blkback/blkback.c | 8 ++++---- drivers/xen/blktap/blktap.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/xen/blkback/blkback.c b/drivers/xen/blkback/blkback.c index afd68ed..6787d0d 100644 --- a/drivers/xen/blkback/blkback.c +++ b/drivers/xen/blkback/blkback.c @@ -314,14 +314,14 @@ static int do_block_io_op(blkif_t *blkif) if (RING_REQUEST_CONS_OVERFLOW(&blk_rings->common, rc)) break; - pending_req = alloc_req(); - if (NULL == pending_req) { - blkif->st_oo_req++; + if (kthread_should_stop()) { more_to_do = 1; break; } - if (kthread_should_stop()) { + pending_req = alloc_req(); + if (NULL == pending_req) { + blkif->st_oo_req++; more_to_do = 1; break; } diff --git a/drivers/xen/blktap/blktap.c b/drivers/xen/blktap/blktap.c index bde14f5..0da7fe4 100644 --- a/drivers/xen/blktap/blktap.c +++ b/drivers/xen/blktap/blktap.c @@ -1237,14 +1237,14 @@ static int do_block_io_op(blkif_t *blkif) break; } - pending_req = alloc_req(); - if (NULL == pending_req) { - blkif->st_oo_req++; + if (kthread_should_stop()) { more_to_do = 1; break; } - if (kthread_should_stop()) { + pending_req = alloc_req(); + if (NULL == pending_req) { + blkif->st_oo_req++; more_to_do = 1; break; } -- 1.7.4.1