From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz0-f49.google.com ([209.85.210.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1RvF4e-0000LS-6w for linux-mtd@lists.infradead.org; Wed, 08 Feb 2012 21:29:08 +0000 Received: by mail-pz0-f49.google.com with SMTP id p5so1010948dak.36 for ; Wed, 08 Feb 2012 13:29:08 -0800 (PST) From: Brian Norris To: Artem Bityutskiy Subject: [PATCH 3/3] libmtd: fix segmentation fault on lib->mtd Date: Wed, 8 Feb 2012 13:26:22 -0800 Message-Id: <1328736382-5798-3-git-send-email-computersforpeace@gmail.com> In-Reply-To: <1328736382-5798-1-git-send-email-computersforpeace@gmail.com> References: <1328736382-5798-1-git-send-email-computersforpeace@gmail.com> Cc: Brian Foster , Brian Norris , linux-mtd@lists.infradead.org List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Legacy systems do not initialize lib->mtd, so we shouldn't perform strlen(lib->mtd); this produces a segmentation fault. As this code isn't used in the legacy codepath, we can just move it down to an 'else' branch. Signed-off-by: Brian Norris --- lib/libmtd.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libmtd.c b/lib/libmtd.c index 2bb4e57..fb4586c 100644 --- a/lib/libmtd.c +++ b/lib/libmtd.c @@ -644,13 +644,15 @@ void libmtd_close(libmtd_t desc) int mtd_dev_present(libmtd_t desc, int mtd_num) { struct stat st; struct libmtd *lib = (struct libmtd *)desc; - char file[strlen(lib->mtd) + 10]; if (!lib->sysfs_supported) return legacy_dev_present(mtd_num); + else { + char file[strlen(lib->mtd) + 10]; - sprintf(file, lib->mtd, mtd_num); - return !stat(file, &st); + sprintf(file, lib->mtd, mtd_num); + return !stat(file, &st); + } } int mtd_get_info(libmtd_t desc, struct mtd_info *info) -- 1.7.5.4