Messages in this thread | | | Subject | Re: [PATCH 07/15] hfs: avoid crash in hfs_bnode_create | From | Vyacheslav Dubeyko <> | Date | Tue, 7 May 2013 23:05:26 +0400 |
| |
On May 7, 2013, at 6:18 PM, Jiri Slaby wrote:
> From: Jeff Mahoney <jeffm@suse.com> > > Commit 634725a92938b0f282b17cec0b007dca77adebd2 removed the BUG_ON in > hfs_bnode_create in hfsplus. This patch removes it from the hfs > version and avoids an fsfuzzer crash. > > Signed-off-by: Jeff Mahoney <jeffm@suse.com> > Acked-by: Jeff Mahoney <jeffm@suse.com> > Signed-off-by: Jiri Slaby <jslaby@suse.cz> > Cc: linux-fsdevel@vger.kernel.org > Cc: Andrew Morton <akpm@linux-foundation.org> > --- > fs/hfs/bnode.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/fs/hfs/bnode.c b/fs/hfs/bnode.c > index f3b1a15..6d435c2 100644 > --- a/fs/hfs/bnode.c > +++ b/fs/hfs/bnode.c > @@ -415,7 +415,11 @@ struct hfs_bnode *hfs_bnode_create(struct hfs_btree *tree, u32 num) > spin_lock(&tree->hash_lock); > node = hfs_bnode_findhash(tree, num); > spin_unlock(&tree->hash_lock); > - BUG_ON(node); > + if (node) { > + printk(KERN_CRIT "new node %u already hashed?\n", num);
The error/debug subsystem of HFS/HFS+ was reworked by Joe Perches, recently. Please, change printk() on pr_crit().
Thanks, Vyacheslav Dubeyko.
> + WARN_ON(1); > + return node; > + } > node = __hfs_bnode_create(tree, num); > if (!node) > return ERR_PTR(-ENOMEM); > -- > 1.8.2.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/
| |