From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andre Przywara Subject: [PATCH 1/2] xl: fix adding configuration parameters over command line Date: Fri, 10 Sep 2010 16:15:27 +0200 Message-ID: <4C8A3D7F.8060804@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------050205010404020407020606" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Stefano Stabellini , Ian Campbell Cc: xen-devel List-Id: xen-devel@lists.xenproject.org --------------050205010404020407020606 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Hi, since we read the configuration text file as is from the disk, there is no trailing \0 at the end terminating the C string. Therefore we must not use strcat to this buffer. Also we need to allocate space for the trailing zero byte. This is needed to make the command line appending actually work, otherwise I get a parser error due to memory trash. Signed-off-by: Andre Przywara Regards, Andre. -- Andre Przywara AMD-Operating System Research Center (OSRC), Dresden, Germany Tel: +49 351 448-3567-12 --------------050205010404020407020606 Content-Type: text/x-patch; name="xl_fix_cmdline_appending.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="xl_fix_cmdline_appending.patch" commit 1b3e5056e47769b3a58f624ae933a227ab6b8b24 Author: Andre Przywara Date: Fri Sep 10 14:26:40 2010 +0200 fix adding configuration parameters over command line Since we read the text file as is from the disk, there is no trailing \0 at the end terminating the C string. Therefore we must not use strcat to this buffer. Also we need to allocate space for the trailing zero byte. Signed-off-by: Andre Przywara diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index e7b9d74..f40de2b 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1397,22 +1397,20 @@ static int create_domain(struct domain_create *dom_info) &config_data, &config_len); if (ret) { fprintf(stderr, "Failed to read config file: %s: %s\n", config_file, strerror(errno)); return ERROR_FAIL; } - if (!restore_file && extra_config - && strlen(extra_config)) { - if (config_len > INT_MAX - (strlen(extra_config) + 2)) { + if (!restore_file && extra_config && strlen(extra_config)) { + if (config_len > INT_MAX - (strlen(extra_config) + 2 + 1)) { fprintf(stderr, "Failed to attach extra configration\n"); return ERROR_FAIL; } + /* allocate space for the extra config plus two EOLs plus \0 */ config_data = realloc(config_data, config_len - + strlen(extra_config) + 2); + + strlen(extra_config) + 2 + 1); if (!config_data) { fprintf(stderr, "Failed to realloc config_data\n"); return ERROR_FAIL; } - strcat(config_data, "\n"); - strcat(config_data, extra_config); - strcat(config_data, "\n"); - config_len += (strlen(extra_config) + 2); + config_len += sprintf(config_data + config_len, "\n%s\n", + extra_config); } } else { if (!config_data) { --------------050205010404020407020606 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------050205010404020407020606--