From patchwork Thu Nov 17 13:03:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 126208 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E3A16B6F88 for ; Fri, 18 Nov 2011 00:04:38 +1100 (EST) Received: from localhost ([::1]:42601 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RR1dr-0004v0-OX for incoming@patchwork.ozlabs.org; Thu, 17 Nov 2011 08:04:35 -0500 Received: from eggs.gnu.org ([140.186.70.92]:58503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RR1db-0004CD-HX for qemu-devel@nongnu.org; Thu, 17 Nov 2011 08:04:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RR1da-0001WW-1z for qemu-devel@nongnu.org; Thu, 17 Nov 2011 08:04:19 -0500 Received: from mtagate7.uk.ibm.com ([194.196.100.167]:56916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RR1dZ-0001Vi-OW for qemu-devel@nongnu.org; Thu, 17 Nov 2011 08:04:18 -0500 Received: from d06nrmr1307.portsmouth.uk.ibm.com (d06nrmr1307.portsmouth.uk.ibm.com [9.149.38.129]) by mtagate7.uk.ibm.com (8.13.1/8.13.1) with ESMTP id pAHD4CmO015219 for ; Thu, 17 Nov 2011 13:04:12 GMT Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pAHD4BRI2060386 for ; Thu, 17 Nov 2011 13:04:11 GMT Received: from d06av05.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pAHD41Xf028539 for ; Thu, 17 Nov 2011 06:04:01 -0700 Received: from localhost (stefanha-thinkpad.manchester-maybrook.uk.ibm.com [9.174.219.31]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id pAHD40g4028524; Thu, 17 Nov 2011 06:04:00 -0700 From: Stefan Hajnoczi To: Date: Thu, 17 Nov 2011 13:03:38 +0000 Message-Id: <1321535018-32543-6-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1321535018-32543-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1321535018-32543-1-git-send-email-stefanha@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 194.196.100.167 Cc: Anthony Liguori , Markus Armbruster , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 5/5] monitor: Fix file_completion() to check for stat() failure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Markus Armbruster stat() can fail for a file name just read with readdir(). Easiest way to trigger is a dangling symbolic link --- look ma, no race! When it fails, file_completion() uses sb.st_mode uninitialized. If the directory bit happens to be set, it appends a "/" to the completed name. Signed-off-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi --- monitor.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/monitor.c b/monitor.c index 5ea35de..1be222e 100644 --- a/monitor.c +++ b/monitor.c @@ -4207,9 +4207,9 @@ static void file_completion(const char *input) /* stat the file to find out if it's a directory. * In that case add a slash to speed up typing long paths */ - stat(file, &sb); - if(S_ISDIR(sb.st_mode)) + if (stat(file, &sb) == 0 && S_ISDIR(sb.st_mode)) { pstrcat(file, sizeof(file), "/"); + } readline_add_completion(cur_mon->rs, file); } }