diff mbox series

block/rnbd-clt: Fix error code in rnbd_clt_add_dev_symlink()

Message ID X9B0IyxwbBDq+cSS@mwanda (mailing list archive)
State New, archived
Headers show
Series block/rnbd-clt: Fix error code in rnbd_clt_add_dev_symlink() | expand

Commit Message

Dan Carpenter Dec. 9, 2020, 6:52 a.m. UTC
The "ret" variable should be set to -ENOMEM but it returns uninitialized
stack data.

Fixes: 64e8a6ece1a5 ("block/rnbd-clt: Dynamically alloc buffer for pathname & blk_symlink_name")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/block/rnbd/rnbd-clt-sysfs.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Chaitanya Kulkarni Dec. 9, 2020, 7:28 a.m. UTC | #1
On 12/8/20 10:54 PM, Dan Carpenter wrote:
> The "ret" variable should be set to -ENOMEM but it returns uninitialized
> stack data.
>
> Fixes: 64e8a6ece1a5 ("block/rnbd-clt: Dynamically alloc buffer for pathname & blk_symlink_name")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Looks good.

Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Jinpu Wang Dec. 9, 2020, 7:36 a.m. UTC | #2
Hi Dan,



On Wed, Dec 9, 2020 at 7:52 AM Dan Carpenter <dan.carpenter@oracle.com> wrote:
>
> The "ret" variable should be set to -ENOMEM but it returns uninitialized
> stack data.
>
> Fixes: 64e8a6ece1a5 ("block/rnbd-clt: Dynamically alloc buffer for pathname & blk_symlink_name")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Thanks for the patch. But there is already a fix from Colin merged in
block tree:
https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git/commit/?h=for-5.11/drivers&id=733c15bd3a944b8eeaacdddf061759b6a83dd3f4

There is still other problem through with commit 64e8a6ece1a5
("block/rnbd-clt: Dynamically alloc buffer for pathname &
blk_symlink_name")

I will send the fix today together with other changes.

Regards!
Jack
Dan Carpenter Dec. 9, 2020, 8:03 a.m. UTC | #3
On Wed, Dec 09, 2020 at 08:36:31AM +0100, Jinpu Wang wrote:
> Hi Dan,
> 
> 
> 
> On Wed, Dec 9, 2020 at 7:52 AM Dan Carpenter <dan.carpenter@oracle.com> wrote:
> >
> > The "ret" variable should be set to -ENOMEM but it returns uninitialized
> > stack data.
> >
> > Fixes: 64e8a6ece1a5 ("block/rnbd-clt: Dynamically alloc buffer for pathname & blk_symlink_name")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> Thanks for the patch. But there is already a fix from Colin merged in
> block tree:
> https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git/commit/?h=for-5.11/drivers&id=733c15bd3a944b8eeaacdddf061759b6a83dd3f4
> 
> There is still other problem through with commit 64e8a6ece1a5
> ("block/rnbd-clt: Dynamically alloc buffer for pathname &
> blk_symlink_name")
> 
> I will send the fix today together with other changes.

Ah...  Haha...  Sorry about that.  We already discussed this yesterday.

What happens is that when I write a patch, I normally save it in my
postponed messages until the next day.  But then I decided to not fix it
but instead to just report it.  Unfortunately, I forgot to delete it and
I also forgot about yesterday's discussion because I have the memory of
a gnat.  :P

regards,
dan carpenter
Jinpu Wang Dec. 9, 2020, 8:05 a.m. UTC | #4
On Wed, Dec 9, 2020 at 9:03 AM Dan Carpenter <dan.carpenter@oracle.com> wrote:
>
> On Wed, Dec 09, 2020 at 08:36:31AM +0100, Jinpu Wang wrote:
> > Hi Dan,
> >
> >
> >
> > On Wed, Dec 9, 2020 at 7:52 AM Dan Carpenter <dan.carpenter@oracle.com> wrote:
> > >
> > > The "ret" variable should be set to -ENOMEM but it returns uninitialized
> > > stack data.
> > >
> > > Fixes: 64e8a6ece1a5 ("block/rnbd-clt: Dynamically alloc buffer for pathname & blk_symlink_name")
> > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> >
> > Thanks for the patch. But there is already a fix from Colin merged in
> > block tree:
> > https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git/commit/?h=for-5.11/drivers&id=733c15bd3a944b8eeaacdddf061759b6a83dd3f4
> >
> > There is still other problem through with commit 64e8a6ece1a5
> > ("block/rnbd-clt: Dynamically alloc buffer for pathname &
> > blk_symlink_name")
> >
> > I will send the fix today together with other changes.
>
> Ah...  Haha...  Sorry about that.  We already discussed this yesterday.
>
> What happens is that when I write a patch, I normally save it in my
> postponed messages until the next day.  But then I decided to not fix it
> but instead to just report it.  Unfortunately, I forgot to delete it and
> I also forgot about yesterday's discussion because I have the memory of
> a gnat.  :P
>
> regards,
> dan carpenter
>
No problem, thanks! :)
diff mbox series

Patch

diff --git a/drivers/block/rnbd/rnbd-clt-sysfs.c b/drivers/block/rnbd/rnbd-clt-sysfs.c
index c3c96a567568..a5cd47b82b40 100644
--- a/drivers/block/rnbd/rnbd-clt-sysfs.c
+++ b/drivers/block/rnbd/rnbd-clt-sysfs.c
@@ -499,6 +499,7 @@  static int rnbd_clt_add_dev_symlink(struct rnbd_clt_dev *dev)
 	dev->blk_symlink_name = kzalloc(len, GFP_KERNEL);
 	if (!dev->blk_symlink_name) {
 		rnbd_clt_err(dev, "Failed to allocate memory for blk_symlink_name\n");
+		ret = -ENOMEM;
 		goto out_err;
 	}