diff mbox

xenpaging: do not leak if --pagefile given twice

Message ID 1455721113-11540-1-git-send-email-ian.campbell@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ian Campbell Feb. 17, 2016, 2:58 p.m. UTC
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 <ian.campbell@citrix.com>
---
 tools/xenpaging/xenpaging.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Konrad Rzeszutek Wilk Feb. 17, 2016, 7:14 p.m. UTC | #1
On Wed, Feb 17, 2016 at 02:58:33PM +0000, Ian Campbell wrote:
> 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
> 

Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> ---
>  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':
> -- 
> 2.1.4
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
Konrad Rzeszutek Wilk Feb. 17, 2016, 7:23 p.m. UTC | #2
On Wed, Feb 17, 2016 at 02:14:38PM -0500, Konrad Rzeszutek Wilk wrote:
> On Wed, Feb 17, 2016 at 02:58:33PM +0000, Ian Campbell wrote:
> > 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
> > 
> 
> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

and applied. Figured nobody would mind this fix.
> 
> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> > ---
> >  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':
> > -- 
> > 2.1.4
> > 
> > 
> > _______________________________________________
> > Xen-devel mailing list
> > Xen-devel@lists.xen.org
> > http://lists.xen.org/xen-devel
diff mbox

Patch

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':