17854f1c81
25833-32on64-bogus-pt_base-adjust.patch 25835-adjust-rcu-lock-domain.patch 25836-VT-d-S3-MSI-resume.patch 25850-tmem-xsa-15-1.patch 25851-tmem-xsa-15-2.patch 25852-tmem-xsa-15-3.patch 25853-tmem-xsa-15-4.patch 25854-tmem-xsa-15-5.patch 25855-tmem-xsa-15-6.patch 25856-tmem-xsa-15-7.patch 25857-tmem-xsa-15-8.patch 25858-tmem-xsa-15-9.patch 25859-tmem-missing-break.patch 25860-tmem-cleanup.patch 25861-x86-early-fixmap.patch 25862-sercon-non-com.patch 25863-sercon-ehci-dbgp.patch 25864-sercon-unused.patch 25866-sercon-ns16550-pci-irq.patch 25867-sercon-ns16550-parse.patch 25874-x86-EFI-chain-cfg.patch 25909-xenpm-consistent.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=201
35 lines
983 B
Diff
35 lines
983 B
Diff
# HG changeset patch
|
|
# User Jan Beulich <jbeulich@suse.com>
|
|
# Date 1347365906 -7200
|
|
# Node ID 109ea6a0c23aa0c5df79e3f5658162aed959ffcf
|
|
# Parent 83b97a59888b6d2d0f984b8403bd5764dd55c10c
|
|
tmem: properly drop lock on error path in do_tmem_op()
|
|
|
|
Reported-by: Tim Deegan <tim@xen.org>
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com>
|
|
|
|
--- a/xen/common/tmem.c
|
|
+++ b/xen/common/tmem.c
|
|
@@ -2659,13 +2659,19 @@ EXPORT long do_tmem_op(tmem_cli_op_t uop
|
|
if ( client != NULL && tmh_client_is_dying(client) )
|
|
{
|
|
rc = -ENODEV;
|
|
- goto out;
|
|
+ if ( tmh_lock_all )
|
|
+ goto out;
|
|
+ simple_error:
|
|
+ errored_tmem_ops++;
|
|
+ return rc;
|
|
}
|
|
|
|
if ( unlikely(tmh_get_tmemop_from_client(&op, uops) != 0) )
|
|
{
|
|
printk("tmem: can't get tmem struct from %s\n",client_str);
|
|
rc = -EFAULT;
|
|
+ if ( !tmh_lock_all )
|
|
+ goto simple_error;
|
|
goto out;
|
|
}
|
|
|