Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp3075757imm; Sun, 1 Jul 2018 11:41:29 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIcclzWDFPzcsqZYMpYNuUPIfzupgaMqRFiEYD/ykqd4XLxEdyYrEO3JjQtRACLdO8uUfSb X-Received: by 2002:a17:902:683:: with SMTP id 3-v6mr23189848plh.291.1530470489792; Sun, 01 Jul 2018 11:41:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530470489; cv=none; d=google.com; s=arc-20160816; b=CeXlsvCyJC8q4nDhfu1dhuJqm/yoWvR8Jy8GczDDTMxDatYQrWO3566qSIPazssfpY 3b7I1Jrye7no2UmLqNhGG+JT7qG/Om27gDt7PH5IFsL52a/ODxwQDv8gcva1e1PrchTi oZawHyEegJ94rLWCD0ofWigGFcjJbieXuDYcm1ZdXfWT1V0rCifxqxtBkTpEpRAXhq2J r9itjks2Tr0w+SRblOXj0dTUkai5bQ5AsjUR7Om6D+px8OgmVBFWQQUIajGcwWrpit/A bmCmovdiyqEI4Cz2DNqh+Hl8OK/qRd87Xs9l7jDOyl55LIgMv/ypb6yYEyEGbFpe3SWC r4cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=v/rDh71X2f9eHIk7AV9WnboeDn3nBvhs/j4kPQdT5Ck=; b=JdnHthHzH2ns98kMxFrpImY3+phbn9tMXeWCsdgoZDMXm62UgYQ4TcGDfg5anLEjlt oDm98VIdqLub2J8jvjEn5y8XObZw++pGsQV1U5RPIoaiC1MrKx84XoBMJdqXEiOd+Vr0 mZW3Tk4U6l39d6ZzGeKhei7LyA5kJs+nW3x/Xq1NK4ioCdgFUtO99Tva4aTPUsy55T2c hFD+KKUtzGfjEviUaU9YuhvjtmMnMyTME+ljdZd72w+uVMPY+BPNb6jWhiJ76b7FnAAY 05pFsZdDt9+QJJbmWHQVTiqSLHGPKhyK2pQdsh3ub0XqY2oZG13JjxiSyaLMm4KEphCl DWhA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t22-v6si13887927plo.263.2018.07.01.11.41.15; Sun, 01 Jul 2018 11:41:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932868AbeGASja (ORCPT + 99 others); Sun, 1 Jul 2018 14:39:30 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:60374 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752729AbeGAQOg (ORCPT ); Sun, 1 Jul 2018 12:14:36 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 3E6054A3; Sun, 1 Jul 2018 16:14:35 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ben Hutchings , Boris Ostrovsky , Juergen Gross Subject: [PATCH 3.18 82/85] xen: Remove unnecessary BUG_ON from __unbind_from_irq() Date: Sun, 1 Jul 2018 18:02:40 +0200 Message-Id: <20180701153125.627241749@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180701153122.365061142@linuxfoundation.org> References: <20180701153122.365061142@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Boris Ostrovsky commit eef04c7b3786ff0c9cb1019278b6c6c2ea0ad4ff upstream. Commit 910f8befdf5b ("xen/pirq: fix error path cleanup when binding MSIs") fixed a couple of errors in error cleanup path of xen_bind_pirq_msi_to_irq(). This cleanup allowed a call to __unbind_from_irq() with an unbound irq, which would result in triggering the BUG_ON there. Since there is really no reason for the BUG_ON (xen_free_irq() can operate on unbound irqs) we can remove it. Reported-by: Ben Hutchings Signed-off-by: Boris Ostrovsky Cc: stable@vger.kernel.org Reviewed-by: Juergen Gross Signed-off-by: Juergen Gross Signed-off-by: Greg Kroah-Hartman --- drivers/xen/events/events_base.c | 2 -- 1 file changed, 2 deletions(-) --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -636,8 +636,6 @@ static void __unbind_from_irq(unsigned i xen_irq_info_cleanup(info); } - BUG_ON(info_for_irq(irq)->type == IRQT_UNBOUND); - xen_free_irq(irq); }