From patchwork Wed Jan 11 17:57:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9510929 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 E30C1606E1 for ; Wed, 11 Jan 2017 17:59:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9ED328512 for ; Wed, 11 Jan 2017 17:59:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BEA12285ED; Wed, 11 Jan 2017 17:59:42 +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 4F84B28512 for ; Wed, 11 Jan 2017 17:59:41 +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 1cRN9g-000351-Pv; Wed, 11 Jan 2017 17:57:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cRN9f-00034v-9J for xen-devel@lists.xen.org; Wed, 11 Jan 2017 17:57:47 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 31/D9-06501-A1276785; Wed, 11 Jan 2017 17:57:46 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRWlGSWpSXmKPExsXitHSDva5UUVm EQd8FHoslHxezODB6HN39mymAMYo1My8pvyKBNePBy27Ggs2sFad7brM0MM5g6WLk5JAQ8Jfo u7+AEcRmE9CX2P3iExOILSKgLnG64yJrFyMHB7OAn8ShB74gYWEBd4npDd/YQWwWAVWJCXdus IHYvAKeEt3rOqFGykmcP/6TGcQWElCTuNZ/iR2iRlDi5MwnYDXMAhISB1+8YJ7AyD0LSWoWkt QCRqZVjBrFqUVlqUW6xgZ6SUWZ6RkluYmZObqGBqZ6uanFxYnpqTmJScV6yfm5mxiBoVDPwMC 4g3HCKr9DjJIcTEqivOmxZRFCfEn5KZUZicUZ8UWlOanFhxhlODiUJHiZCoFygkWp6akVaZk5 wKCESUtw8CiJ8H4uAErzFhck5hZnpkOkTjHqcpz6dOElkxBLXn5eqpQ4Lw/IDAGQoozSPLgRs Ai5xCgrJczLyMDAIMRTkFqUm1mCKv+KUZyDUUmY1wVkCk9mXgncpldARzABHRFpVwxyREkiQk qqgXHH4pl6Jx4mrT2yRu3RsdmBt3PqJ5Xc968MPb6Uz/yN1u0NS7rcz59f9IPh1qn9JeEzAhR 2xi2e3npw+8k58zpyTtwyMnvTdPsyS5Cm8Zv8MK+U7/9XFhey+jSazWSvTZFcXB+u9VJOLXyK xevtll0tR+wWPvD/n6Xf1q19OGNBb120T67X45dKLMUZiYZazEXFiQAqgX5RiwIAAA== X-Env-Sender: prvs=177b47e76=Andrew.Cooper3@citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1484157464!79236158!1 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.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5884 invoked from network); 11 Jan 2017 17:57:45 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-6.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 11 Jan 2017 17:57:45 -0000 X-IronPort-AV: E=Sophos;i="5.33,346,1477958400"; d="scan'208";a="408116214" From: Andrew Cooper To: Xen-devel Date: Wed, 11 Jan 2017 17:57:41 +0000 Message-ID: <1484157461-12185-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Cc: Andrew Cooper , Jan Beulich Subject: [Xen-devel] [PATCH] x86/sysctl: Fix NULL pointer dereference in error path 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 This was introduced by c/s c38869e711 "x86/cpuid: Drop the temporary linear feature bitmap from struct cpuid_policy", and caught by Coverity. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich --- xen/arch/x86/sysctl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index 87da541..274ca0c 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -229,7 +229,10 @@ long arch_do_sysctl( /* Bad featureset index? */ if ( !p ) + { ret = -EINVAL; + break; + } cpuid_policy_to_featureset(p, featureset);