Messages in this thread | | | Date | Mon, 13 May 2019 20:57:20 +1000 | From | "Tobin C. Harding" <> | Subject | Re: [PATCH 2/2] fs: btrfs: Don't leak memory when failing add fsid |
| |
On Mon, May 13, 2019 at 09:04:49AM +0300, Nikolay Borisov wrote: > > > On 13.05.19 г. 6:39 ч., Tobin C. Harding wrote: > > A failed call to kobject_init_and_add() must be followed by a call to > > kobject_put(). Currently in the error path when adding fs_devices we > > are missing this call. This could be fixed by calling > > btrfs_sysfs_remove_fsid() if btrfs_sysfs_add_fsid() returns an error or > > by adding a call to kobject_put() directly in btrfs_sysfs_add_fsid(). > > Here we choose the second option because it prevents the slightly > > unusual error path handling requirements of kobject from leaking out > > into btrfs functions. > > > > Add a call to kobject_put() in the error path of kobject_add_and_init(). > > This causes the release method to be called if kobject_init_and_add() > > fails. open_tree() is the function that calls btrfs_sysfs_add_fsid() > > and the error code in this function is already written with the > > assumption that the release method is called during the error path of > > open_tree() (as seen by the call to btrfs_sysfs_remove_fsid() under the > > fail_fsdev_sysfs label). > > I'm not familiar with the internals of kobject but > btrfs_sysfs_remove_fsid calls __btrfs_sysfs_remove_fsid which in turn > does kobject_del followed by kobject_put so its sequence is not exactly > identical with your change. Presumably kobject_del is only required if > you want to dispose of successfully registered sysfs node. This implies > that __btrfs_sysfs_remove_fsid is actually broken when it comes to > handling failed sysfs_add_fsid?
kobject_del() is not technically required in __btrfs_sysfs_remove_fsid() since if kobject_put() drops the reference count to 0 and kobject_del() has not been called then the kobject infrastructure will call kobject_del() for us (and we get a pr_debug() message). The code sequence is correct although not _exactly_ written as the kobject authors intended (I am not one of those authors, I'm just learning).
Thanks for looking at this.
Tobin
| |