From patchwork Mon May 2 13:05:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Rzeszutek Wilk X-Patchwork-Id: 8992341 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B6D5B9F39D for ; Mon, 2 May 2016 13:08:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E331A201FE for ; Mon, 2 May 2016 13:08:13 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id A79D6201FA for ; Mon, 2 May 2016 13:08:12 +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 1axDXu-0000fq-Ry; Mon, 02 May 2016 13:05:54 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1axDXt-0000fk-Vp for xen-devel@lists.xenproject.org; Mon, 02 May 2016 13:05:54 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 6F/FB-03651-1B057275; Mon, 02 May 2016 13:05:53 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrFLMWRWlGSWpSXmKPExsUyZ7p8oO6GAPV wg7+/DSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozpr2czFUxnq9jzq4elgXESaxcjF4eQQCuT xPZFj6Gcr4wSE87PZIZw1jNKbH0/iQXC6WaUeHdpG3sXIyeQUyRx6ts5pi5GDg42AROJN6scQ cIiAqYS2yeeBKtnFljLKDGj/wBYvbCAjsS9B3tZQGwWAVWJX7MXMoP08gq4SuxqMAYxJQTkJB ZcSAepkBAwlDj9cBvjBEbeBYwMqxjVi1OLylKLdE30kooy0zNKchMzc3QNDYz1clOLixPTU3M Sk4r1kvNzNzECw4EBCHYwNn5xOsQoycGkJMqbZKEeLsSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mC d6I/UE6wKDU9tSItMwcYmDBpCQ4eJRFeBV+gNG9xQWJucWY6ROoUoy7Hgh+31zIJseTl56VKi fMmgMwQACnKKM2DGwGLkkuMslLCvIxARwnxFKQW5WaWoMq/YhTnYFQS5p0LMoUnM68EbtMroC OYgI7IXq8KckRJIkJKqoFx8u2rxctvP7UMZA7mtOvse3T0SdjFJ1JCy1aKvuSQfv3sZyk70zm VxI50lnedjlf67r2cMXFd3iXFag/bc2s/uv1NkZT79kfEjcvJfb1QYgfndLnYwjaJiI9pRzRC TORr/9y4ldCbuJLfanaxA8/qlxviuKsOFJifYMmauELu2odoyYeTfgQpsRRnJBpqMRcVJwIAK pv/s40CAAA= X-Env-Sender: konrad@char.us.oracle.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1462194350!34850136!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15509 invoked from network); 2 May 2016 13:05:52 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-5.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 2 May 2016 13:05:52 -0000 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u42D5iZU006280 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 2 May 2016 13:05:44 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u42D5il1006213 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 2 May 2016 13:05:44 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u42D5hsH022189; Mon, 2 May 2016 13:05:43 GMT Received: from char.us.oracle.com (/10.137.176.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 02 May 2016 06:05:43 -0700 Received: by char.us.oracle.com (Postfix, from userid 1000) id 8BCF26A0124; Mon, 2 May 2016 09:05:38 -0400 (EDT) From: Konrad Rzeszutek Wilk To: xen-devel@lists.xenproject.org, konrad@kernel.org Date: Mon, 2 May 2016 09:05:34 -0400 Message-Id: <1462194334-2761-1-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 2.5.0 X-Source-IP: userv0021.oracle.com [156.151.31.71] Cc: Andrew Cooper , Wei Liu , Jan Beulich , Konrad Rzeszutek Wilk Subject: [Xen-devel] [PATCH] xsplice: Missing if ( sec ) 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add the missing conditional. Reported-by: Jan Beulich Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Wei Liu --- This has been in there since v3 posting! And I really need to finish with the OSSTest regression tests to catch this. Cc: Andrew Cooper Cc: Jan Beulich Cc: Wei Liu --- xen/common/xsplice.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/common/xsplice.c b/xen/common/xsplice.c index 777faa7..c9fc53a 100644 --- a/xen/common/xsplice.c +++ b/xen/common/xsplice.c @@ -548,6 +548,7 @@ static int prepare_payload(struct payload *payload, } sec = xsplice_elf_sec_by_name(elf, ELF_XSPLICE_DEPENDS); + if ( sec ) { n = sec->load_addr;