X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fparams.c;h=53b958fcd639eb2d93d9bed73cffbb9250df7c06;hb=afeb52d6b579ae4ee9bd4b63dac4579b39f8b1c0;hp=ed35345be536eefb68f1cd585b7c0213f24419b4;hpb=47e1993d32d4e0f9524c2147576468fe11e87b5f;p=~andy%2Flinux

diff --git a/kernel/params.c b/kernel/params.c
index ed35345be53..53b958fcd63 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -613,10 +613,13 @@ static __modinit int add_sysfs_param(struct module_kobject *mk,
 		       sizeof(*mk->mp) + sizeof(mk->mp->attrs[0]) * (num+1),
 		       GFP_KERNEL);
 	if (!new) {
-		kfree(mk->mp);
+		kfree(attrs);
 		err = -ENOMEM;
 		goto fail;
 	}
+	/* Despite looking like the typical realloc() bug, this is safe.
+	 * We *want* the old 'attrs' to be freed either way, and we'll store
+	 * the new one in the success case. */
 	attrs = krealloc(attrs, sizeof(new->grp.attrs[0])*(num+2), GFP_KERNEL);
 	if (!attrs) {
 		err = -ENOMEM;