From patchwork Wed Feb 17 14:58:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 8339981 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B4C49C0553 for ; Wed, 17 Feb 2016 15:01:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 02905203AB for ; Wed, 17 Feb 2016 15:01:25 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EE025203A4 for ; Wed, 17 Feb 2016 15:01:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aW3Yu-0007kY-3m; Wed, 17 Feb 2016 14:58:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aW3Ys-0007kP-Pf for xen-devel@lists.xen.org; Wed, 17 Feb 2016 14:58:38 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 78/E1-09834-D9A84C65; Wed, 17 Feb 2016 14:58:37 +0000 X-Env-Sender: prvs=848fde4e6=Ian.Campbell@citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1455721115!24599896!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2602 invoked from network); 17 Feb 2016 14:58:37 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 17 Feb 2016 14:58:37 -0000 X-IronPort-AV: E=Sophos;i="5.22,461,1449532800"; d="scan'208";a="332349346" From: Ian Campbell To: , , Date: Wed, 17 Feb 2016 14:58:33 +0000 Message-ID: <1455721113-11540-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell Subject: [Xen-devel] [PATCH] xenpaging: do not leak if --pagefile given twice X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org 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 By freeing filename (which is either NULL or the previous iteration of this argument). This implements a semantic where the last --pagefile given on the command line takes precedence. This is the same semantic as the other options have. CID: 1198792 Signed-off-by: Ian Campbell Reviewed-by: Konrad Rzeszutek Wilk --- tools/xenpaging/xenpaging.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/xenpaging/xenpaging.c b/tools/xenpaging/xenpaging.c index 0377507..6157d3a 100644 --- a/tools/xenpaging/xenpaging.c +++ b/tools/xenpaging/xenpaging.c @@ -232,6 +232,7 @@ static int xenpaging_getopts(struct xenpaging *paging, int argc, char *argv[]) paging->vm_event.domain_id = atoi(optarg); break; case 'f': + free(filename); filename = strdup(optarg); break; case 'm':