[no subject]

From: Eric Sesterhenn
Date: Wed Sep 03 2008 - 11:04:29 EST


akpm@xxxxxxxxxxxxxxxxxxxx
Bcc:
Subject: Re: [Patch] Check hfs_bnode_find return value
Reply-To:
In-Reply-To: <Pine.LNX.4.64.0808290405480.2507@xxxxxxxxxxxxxxxxxxxxx>
X-Editor: Vim http://www.vim.org/
X-Info: http://www.snake-basket.de
X-Operating-System: Linux/2.6.27-rc4 (x86_64)
X-Uptime: 16:56:46 up 6:37, 1 user, load average: 1.90, 0.90, 0.60

* Roman Zippel (zippel@xxxxxxxxxxxxxx) wrote:
> Hi,
>
> On Tue, 26 Aug 2008, Eric Sesterhenn wrote:
>
> > --- linux/fs/hfsplus/brec.c.orig 2008-08-26 19:18:56.000000000 +0200
> > +++ linux/fs/hfsplus/brec.c 2008-08-26 19:19:27.000000000 +0200
> > @@ -304,6 +304,8 @@ static struct hfs_bnode *hfs_bnode_split
> > /* update next bnode header */
> > if (new_node->next) {
> > struct hfs_bnode *next_node = hfs_bnode_find(tree, new_node->next);
> > + if (IS_ERR(next_node))
> > + return next_node;
> > next_node->prev = new_node->this;
> > hfs_bnode_read(next_node, &node_desc, 0, sizeof(node_desc));
> > node_desc.prev = cpu_to_be32(next_node->prev);
>
> Al Viro already fixed this for HFS in a better way, could you please adopt
> his solution?

This is the patch from hfs applied to hfsplus (see
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=3d10a15d6919488204bdb264050d156ced20d9aa
). Guess Al should sign this off since it is his work?


--- linux/fs/hfsplus/brec.c.orig 2008-09-03 17:00:07.000000000 +0200
+++ linux/fs/hfsplus/brec.c 2008-09-03 17:00:43.000000000 +0200
@@ -216,7 +216,7 @@ skip:
static struct hfs_bnode *hfs_bnode_split(struct hfs_find_data *fd)
{
struct hfs_btree *tree;
- struct hfs_bnode *node, *new_node;
+ struct hfs_bnode *node, *new_node, *next_node;
struct hfs_bnode_desc node_desc;
int num_recs, new_rec_off, new_off, old_rec_off;
int data_start, data_end, size;
@@ -235,6 +235,17 @@ static struct hfs_bnode *hfs_bnode_split
new_node->type = node->type;
new_node->height = node->height;

+ if (node->next)
+ next_node = hfs_bnode_find(tree, node->next);
+ else
+ next_node = NULL;
+
+ if (IS_ERR(next_node)) {
+ hfs_bnode_put(node);
+ hfs_bnode_put(new_node);
+ return next_node;
+ }
+
size = tree->node_size / 2 - node->num_recs * 2 - 14;
old_rec_off = tree->node_size - 4;
num_recs = 1;
@@ -248,6 +259,8 @@ static struct hfs_bnode *hfs_bnode_split
/* panic? */
hfs_bnode_put(node);
hfs_bnode_put(new_node);
+ if (next_node)
+ hfs_bnode_put(next_node);
return ERR_PTR(-ENOSPC);
}

@@ -302,8 +315,7 @@ static struct hfs_bnode *hfs_bnode_split
hfs_bnode_write(node, &node_desc, 0, sizeof(node_desc));

/* update next bnode header */
- if (new_node->next) {
- struct hfs_bnode *next_node = hfs_bnode_find(tree, new_node->next);
+ if (next_node) {
next_node->prev = new_node->this;
hfs_bnode_read(next_node, &node_desc, 0, sizeof(node_desc));
node_desc.prev = cpu_to_be32(next_node->prev);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/