From: Yu Zhiguo <yuzg@cn.fujitsu.com>
To: Keir Fraser <keir.fraser@eu.citrix.com>
Cc: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>
Subject: [PATCH] tools/xenpaging: fix bug of Segmentation fault
Date: Thu, 11 Feb 2010 13:57:01 +0800 [thread overview]
Message-ID: <4B739C2D.5050200@cn.fujitsu.com> (raw)
Segmentation fault occurs in two situations:
1. argc is less than 3
2. xenpaging_init() fault
Signed-off-by: Yu Zhiguo <yuzg@cn.fujitsu.com>
diff --git a/tools/xenpaging/xenpaging.c b/tools/xenpaging/xenpaging.c
--- a/tools/xenpaging/xenpaging.c
+++ b/tools/xenpaging/xenpaging.c
@@ -212,6 +212,9 @@
{
int rc;
+ if ( paging == NULL )
+ return 0;
+
/* Tear down domain paging in Xen */
rc = xc_mem_event_disable(paging->xc_handle, paging->mem_event.domain_id);
if ( rc != 0 )
@@ -447,20 +450,29 @@
int main(int argc, char *argv[])
{
- domid_t domain_id = atoi(argv[1]);
- int num_pages = atoi(argv[2]);
+ domid_t domain_id;
+ int num_pages;
xenpaging_t *paging;
- xenpaging_victim_t victims[num_pages];
+ xenpaging_victim_t *victims;
mem_event_request_t req;
mem_event_response_t rsp;
int i;
- int rc;
+ int rc = -1, rc1;
int open_flags = O_CREAT | O_TRUNC | O_RDWR;
mode_t open_mode = S_IRUSR | S_IRGRP | S_IROTH | S_IWUSR | S_IWGRP | S_IWOTH;
char filename[80];
int fd;
+ if ( argc != 3 ) {
+ fprintf(stderr, "Usage: %s <domain_id> <num_pages>\n", argv[0]);
+ return -1;
+ }
+ domain_id = atoi(argv[1]);
+ num_pages = atoi(argv[2]);
+
+ victims = calloc(num_pages, sizeof(xenpaging_victim_t));
+
/* Open file */
sprintf(filename, "page_cache_%d", domain_id);
fd = open(filename, open_flags, open_mode);
@@ -586,15 +598,17 @@
}
out:
+ free(victims);
+
/* Tear down domain paging */
- rc = xenpaging_teardown(paging);
- if ( rc != 0 )
- {
+ rc1 = xenpaging_teardown(paging);
+ if ( rc1 != 0 )
ERROR("Error tearing down paging");
- exit(1);
- }
- return 0;
+ if ( rc == 0 )
+ rc = rc1;
+
+ return rc;
}
next reply other threads:[~2010-02-11 5:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-11 5:57 Yu Zhiguo [this message]
2010-02-11 17:22 ` [PATCH] tools/xenpaging: fix bug of Segmentation fault Patrick Colp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B739C2D.5050200@cn.fujitsu.com \
--to=yuzg@cn.fujitsu.com \
--cc=keir.fraser@eu.citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.