From patchwork Tue Aug 15 12:30:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9901719 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9FB2560230 for ; Tue, 15 Aug 2017 12:32:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9275A281B7 for ; Tue, 15 Aug 2017 12:32:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 874C828846; Tue, 15 Aug 2017 12:32:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AE4AE28553 for ; Tue, 15 Aug 2017 12:32:42 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhazb-0003Sg-2g; Tue, 15 Aug 2017 12:30:43 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhaza-0003Rs-2B for xen-devel@lists.xen.org; Tue, 15 Aug 2017 12:30:42 +0000 Received: from [193.109.254.147] by server-7.bemta-6.messagelabs.com id 25/21-03557-179E2995; Tue, 15 Aug 2017 12:30:41 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprEIsWRWlGSWpSXmKPExsXitHSDvW7By0m RBvPf6Fss+biYxYHR4+ju30wBjFGsmXlJ+RUJrBkNGzqZC57zVXR3zGVuYDzI3cXIySEh4C+x /Ns6ZhCbTUBfYveLT0wgtoiAusTpjousXYxcHMwCTxglJi5qZwFJCAvYS6xb2MsKYrMIqEqsu reNEcTmFfCUWHf7MjPEUDmJ88d/gtmcAl4Sbef72EFsIaCah3fOM0LYahLX+i+xQ/QKSpyc+Q RsPrOAhMTBFy+YJzDyzkKSmoUktYCRaRWjRnFqUVlqka6RgV5SUWZ6RkluYmaOrqGBmV5uanF xYnpqTmJSsV5yfu4mRmD4MADBDsZfywIOMUpyMCmJ8i46OylSiC8pP6UyI7E4I76oNCe1+BCj DAeHkgTvuudAOcGi1PTUirTMHGAgw6QlOHiURHiNQdK8xQWJucWZ6RCpU4y6HK8m/P/GJMSSl 5+XKiXOK/8CqEgApCijNA9uBCyqLjHKSgnzMgIdJcRTkFqUm1mCKv+KUZyDUUmYVxFkCk9mXg ncpldARzABHXGlHeyIkkSElFQD47rWOxqGXNr/C0V3WF6Pfqyx5+ee9W1Ly/clhQX8ffK9nE+ joPQCV1r5hijF2cczRTkdk7+38ts1nBHpk538g3eagnB52eOAZa5OFa8K52b9fVlbc2zP2nO8 d1rf77wXbl8u7xURq3Zkv3276VeGSX43Dm79vXOecO/WK3mWGfa3c78U3eRbqsRSnJFoqMVcV JwIAOsCJ46lAgAA X-Env-Sender: prvs=3930249d3=Andrew.Cooper3@citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1502800235!88680861!3 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24004 invoked from network); 15 Aug 2017 12:30:40 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-10.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 15 Aug 2017 12:30:40 -0000 X-IronPort-AV: E=Sophos;i="5.41,377,1498521600"; d="scan'208";a="443835792" From: Andrew Cooper To: Xen-devel Date: Tue, 15 Aug 2017 13:30:31 +0100 Message-ID: <1502800232-26670-6-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1502800232-26670-1-git-send-email-andrew.cooper3@citrix.com> References: <1502800232-26670-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 Cc: Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Tim Deegan , Jan Beulich Subject: [Xen-devel] [PATCH 5/6] common/gnttab: gnttab_query_size() cleanup X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Drop pointless debugging messages, and reduce variable scope. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: George Dunlap CC: Jan Beulich CC: Stefano Stabellini CC: Tim Deegan CC: Wei Liu --- xen/common/grant_table.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 6ed86f5..615a8b4 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -1731,31 +1731,25 @@ gnttab_query_size( XEN_GUEST_HANDLE_PARAM(gnttab_query_size_t) uop, unsigned int count) { struct gnttab_query_size op; - struct domain *d; - int rc; + struct domain *d = NULL; if ( count != 1 ) return -EINVAL; - if ( unlikely(copy_from_guest(&op, uop, 1) != 0) ) - { - gdprintk(XENLOG_INFO, "Fault while reading gnttab_query_size_t.\n"); + if ( unlikely(copy_from_guest(&op, uop, 1)) ) return -EFAULT; - } d = rcu_lock_domain_by_any_id(op.dom); if ( d == NULL ) { - gdprintk(XENLOG_INFO, "Bad domid %d.\n", op.dom); op.status = GNTST_bad_domain; - goto query_out; + goto out; } - rc = xsm_grant_query_size(XSM_TARGET, current->domain, d); - if ( rc ) + if ( xsm_grant_query_size(XSM_TARGET, current->domain, d) ) { op.status = GNTST_permission_denied; - goto query_out_unlock; + goto out; } grant_read_lock(d->grant_table); @@ -1766,11 +1760,10 @@ gnttab_query_size( grant_read_unlock(d->grant_table); + out: + if ( d ) + rcu_unlock_domain(d); - query_out_unlock: - rcu_unlock_domain(d); - - query_out: if ( unlikely(__copy_to_guest(uop, &op, 1)) ) return -EFAULT;