From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751940AbbBRKYJ (ORCPT <rfc822;w@1wt.eu>);
	Wed, 18 Feb 2015 05:24:09 -0500
Received: from userp1040.oracle.com ([156.151.31.81]:16595 "EHLO
	userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750962AbbBRKYH (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 18 Feb 2015 05:24:07 -0500
Date: Wed, 18 Feb 2015 13:24:07 +0300
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Jake Oshins <jakeo@microsoft.com>
Cc: rafael.j.wysocki@intel.com, gregkh@linuxfoundation.org, kys@microsoft.com,
        linux-kernel@vger.kernel.org, devel@linuxdriverproject.org,
        olaf@aepfle.de, apw@canonical.com, vkuznets@redhat.com
Subject: Re: [PATCH 2/3] drivers:hv Convert VMBus and its descendants to PnP
Message-ID: <20150218102407.GB5206@mwanda>
References: <1424202111-14461-1-git-send-email-jakeo@microsoft.com>
 <1424202111-14461-2-git-send-email-jakeo@microsoft.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1424202111-14461-2-git-send-email-jakeo@microsoft.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
X-Source-IP: acsinet22.oracle.com [141.146.126.238]
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Feb 17, 2015 at 11:41:50AM -0800, Jake Oshins wrote:
>  
> +	ret = pnp_add_descendant(child_device_obj->pnp_dev);
>  	if (ret)
> +		goto register_exit;
> +
> +	added = TRUE;
> +
> +	ret = pnp_activate_dev(child_device_obj->pnp_dev);
> +
> +register_exit:
> +
> +	if (ret) {
> +		if (added)
> +			pnp_remove_descendant(child_device_obj->pnp_dev);
> +		free_pnp_descendant(child_device_obj->pnp_dev);
>  		pr_err("Unable to register child device\n");
> -	else
> +	} else
>  		pr_debug("child device %s registered\n",
> -			dev_name(&child_device_obj->device));
> +			 dev_name(&child_device_obj->pnp_dev->dev));
>  
>  	return ret;
>  }

This error handling is horribly ugly and has a bug.  Please, read my
essay on how to do error handling properly.

https://plus.google.com/106378716002406849458/posts/dnanfhQ4mHQ

1) Don't do "One Err" style error handling.
2) Don't twist the success path and the error paths together.
3) Don't use the "added" variable.
4) Don't initialize "ret" at the start of the function.
5) Don't forget to undo pnp_descendant_memory_option()

It should look something like:

	return 0;

err_remove_desc:
	pnp_remove_descendant(child_device_obj->pnp_dev);
err_remove_option:
	if (bytes)
		remove_whatever();
err_free_desc:
	free_pnp_descendant(child_device_obj->pnp_dev);

	return ret;

regards,
dan carpenter