kernel-janitors.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [patch] ocfs2: potential ERR_PTR dereference on error paths
@ 2010-04-22  9:39 Dan Carpenter
  2010-04-22 13:44 ` Tao Ma
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Dan Carpenter @ 2010-04-22  9:39 UTC (permalink / raw)
  To: ocfs2-devel

If "handle" is non null at the end of the function then we assume it's a
valid pointer and pass it to ocfs2_commit_trans();

Signed-off-by: Dan Carpenter <error27@gmail.com>

diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index 07cc8bb..ae8e161 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -558,6 +558,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb,
 		handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
 		if (IS_ERR(handle)) {
 			status = PTR_ERR(handle);
+			handle = NULL;
 			mlog_errno(status);
 			goto out;
 		}

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [patch] ocfs2: potential ERR_PTR dereference on error paths
  2010-04-22  9:39 [patch] ocfs2: potential ERR_PTR dereference on error paths Dan Carpenter
@ 2010-04-22 13:44 ` Tao Ma
  2010-04-23 21:45 ` Joel Becker
  2010-05-06 15:24 ` [Ocfs2-devel] " Mark Fasheh
  2 siblings, 0 replies; 4+ messages in thread
From: Tao Ma @ 2010-04-22 13:44 UTC (permalink / raw)
  To: ocfs2-devel

Dan Carpenter wrote:
> If "handle" is non null at the end of the function then we assume it's a
> valid pointer and pass it to ocfs2_commit_trans();
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
>
> diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
> index 07cc8bb..ae8e161 100644
> --- a/fs/ocfs2/inode.c
> +++ b/fs/ocfs2/inode.c
> @@ -558,6 +558,7 @@ static int ocfs2_truncate_for_delete(struct ocfs2_super *osb,
>  		handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
>  		if (IS_ERR(handle)) {
>  			status = PTR_ERR(handle);
> +			handle = NULL;
>  			mlog_errno(status);
>  			goto out;
>  		}
>   
Good catch.
Acked-by: Tao Ma <tao.ma@oracle.com>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [patch] ocfs2: potential ERR_PTR dereference on error paths
  2010-04-22  9:39 [patch] ocfs2: potential ERR_PTR dereference on error paths Dan Carpenter
  2010-04-22 13:44 ` Tao Ma
@ 2010-04-23 21:45 ` Joel Becker
  2010-05-06 15:24 ` [Ocfs2-devel] " Mark Fasheh
  2 siblings, 0 replies; 4+ messages in thread
From: Joel Becker @ 2010-04-23 21:45 UTC (permalink / raw)
  To: ocfs2-devel

On Thu, Apr 22, 2010 at 11:39:29AM +0200, Dan Carpenter wrote:
> If "handle" is non null at the end of the function then we assume it's a
> valid pointer and pass it to ocfs2_commit_trans();
> 
> Signed-off-by: Dan Carpenter <error27@gmail.com>

	This patch is now in the 'fixes' branch of ocfs2.git.

Joel

-- 

"And yet I fight,
 And yet I fight this battle all alone.
 No one to cry to;
 No place to call home."

Joel Becker
Principal Software Developer
Oracle
E-mail: joel.becker@oracle.com
Phone: (650) 506-8127

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Ocfs2-devel] [patch] ocfs2: potential ERR_PTR dereference on error paths
  2010-04-22  9:39 [patch] ocfs2: potential ERR_PTR dereference on error paths Dan Carpenter
  2010-04-22 13:44 ` Tao Ma
  2010-04-23 21:45 ` Joel Becker
@ 2010-05-06 15:24 ` Mark Fasheh
  2 siblings, 0 replies; 4+ messages in thread
From: Mark Fasheh @ 2010-05-06 15:24 UTC (permalink / raw)
  To: ocfs2-devel

On Thu, Apr 22, 2010 at 11:39:29AM +0200, Dan Carpenter wrote:
> If "handle" is non null at the end of the function then we assume it's a
> valid pointer and pass it to ocfs2_commit_trans();
> 
> Signed-off-by: Dan Carpenter <error27@gmail.com>

Acked-by: Mark Fasheh <mfasheh@suse.com>
	--Mark

--
Mark Fasheh

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-05-06 15:24 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-22  9:39 [patch] ocfs2: potential ERR_PTR dereference on error paths Dan Carpenter
2010-04-22 13:44 ` Tao Ma
2010-04-23 21:45 ` Joel Becker
2010-05-06 15:24 ` [Ocfs2-devel] " Mark Fasheh

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).