Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936428AbcKNChZ (ORCPT ); Sun, 13 Nov 2016 21:37:25 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:47425 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751662AbcKNCf2 (ORCPT ); Sun, 13 Nov 2016 21:35:28 -0500 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "David Vrabel" , "Jan Beulich" , "Jan Beulich" , "Richard =?UTF-8?Q?Sch=C3=BCtz?=" , "Ed Swierk" Date: Mon, 14 Nov 2016 00:14:07 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.2 151/152] xenbus: don't look up transaction IDs for ordinary writes In-Reply-To: X-SA-Exim-Connect-IP: 2a02:8011:400e:2:6f00:88c8:c921:d332 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1164 Lines: 34 3.2.84-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Jan Beulich commit 9a035a40f7f3f6708b79224b86c5777a3334f7ea upstream. This should really only be done for XS_TRANSACTION_END messages, or else at least some of the xenstore-* tools don't work anymore. Fixes: 0beef634b8 ("xenbus: don't BUG() on user mode induced condition") Reported-by: Richard Schütz Signed-off-by: Jan Beulich Tested-by: Richard Schütz Signed-off-by: David Vrabel Cc: Ed Swierk [bwh: Backported to 3.2: adjust filename] Signed-off-by: Ben Hutchings --- drivers/xen/xenfs/xenbus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/xen/xenfs/xenbus.c +++ b/drivers/xen/xenfs/xenbus.c @@ -310,7 +310,7 @@ static int xenbus_write_transaction(unsi rc = -ENOMEM; goto out; } - } else { + } else if (msg_type == XS_TRANSACTION_END) { list_for_each_entry(trans, &u->transactions, list) if (trans->handle.id == u->u.msg.tx_id) break;