From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Josef 'Jeff' Sipek" Subject: [PATCH 01/13] fs/unionfs: Fix a memory leak & null pointer dereference Date: Sun, 4 Mar 2007 21:16:45 -0500 Message-ID: <117306101737-git-send-email-jsipek@cs.sunysb.edu> References: <11730610174005-git-send-email-jsipek@cs.sunysb.edu> Cc: Erez Zadok , "Josef 'Jeff' Sipek" To: linux-fsdevel@vger.kernel.org Return-path: Received: from filer.fsl.cs.sunysb.edu ([130.245.126.2]:39132 "EHLO filer.fsl.cs.sunysb.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751033AbXCECRE (ORCPT ); Sun, 4 Mar 2007 21:17:04 -0500 In-Reply-To: <11730610174005-git-send-email-jsipek@cs.sunysb.edu> Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org From: Erez Zadok Signed-off-by: Erez Zadok Signed-off-by: Josef 'Jeff' Sipek --- fs/unionfs/commonfops.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c index 379c525..66d6ce9 100644 --- a/fs/unionfs/commonfops.c +++ b/fs/unionfs/commonfops.c @@ -230,7 +230,7 @@ int unionfs_file_revalidate(struct file *file, int willwrite) unionfs_read_lock(sb); if (!unionfs_d_revalidate(dentry, NULL) && !d_deleted(dentry)) { err = -ESTALE; - goto out; + goto out_nofree; } sbgen = atomic_read(&UNIONFS_SB(sb)->generation); @@ -286,6 +286,9 @@ int unionfs_file_revalidate(struct file *file, int willwrite) } out: + if (err) + kfree(UNIONFS_F(file)->lower_files); +out_nofree: unionfs_unlock_dentry(dentry); unionfs_read_unlock(dentry->d_sb); return err; @@ -391,7 +394,7 @@ int unionfs_open(struct inode *inode, struct file *file) file->private_data = kzalloc(sizeof(struct unionfs_file_info), GFP_KERNEL); if (!UNIONFS_F(file)) { err = -ENOMEM; - goto out; + goto out_nofree; } fbstart(file) = -1; fbend(file) = -1; @@ -444,7 +447,7 @@ out: kfree(UNIONFS_F(file)->lower_files); kfree(UNIONFS_F(file)); } - +out_nofree: return err; } -- 1.5.0.2.260.g2eb065