From 38a1971e5b8ad7f30722d84e74152c980338fbdb Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Sun, 18 Mar 2012 13:28:45 +0100 Subject: [PATCH] FAT: Fix error path - forward the return value of chk_mounted to detect whether mount succeeded - free resources on mount failure Signed-off-by: Sascha Hauer --- fs/fat/fat.c | 18 +++++++++++++++--- fs/fat/ff.c | 4 +--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 7d6e37a6b..21464bde9 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -376,6 +376,7 @@ static int fat_probe(struct device_d *dev) struct fs_device_d *fsdev = dev_to_fs_device(dev); struct fat_priv *priv = xzalloc(sizeof(struct fat_priv)); char *backingstore = fsdev->backingstore; + int ret; dev->priv = priv; @@ -383,13 +384,24 @@ static int fat_probe(struct device_d *dev) backingstore += 5; priv->cdev = cdev_open(backingstore, O_RDWR); - if (!priv->cdev) - return -EINVAL; + if (!priv->cdev) { + ret = -ENOENT; + goto err_open; + } priv->fat.userdata = priv; - f_mount(&priv->fat); + ret = f_mount(&priv->fat); + if (ret) + goto err_mount; return 0; + +err_mount: + cdev_close(priv->cdev); +err_open: + free(priv); + + return ret; } static void fat_remove(struct device_d *dev) diff --git a/fs/fat/ff.c b/fs/fat/ff.c index a72038942..2d476ee2d 100644 --- a/fs/fat/ff.c +++ b/fs/fat/ff.c @@ -1699,9 +1699,7 @@ int f_mount ( { fs->fs_type = 0; /* Clear new fs object */ - chk_mounted(fs, 0); - - return 0; + return chk_mounted(fs, 0); } /*