Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d237c7d0 authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

scsi: aacraid: Fix double-free on probe failure 



[ Upstream commit 919ddf8336f0b84c0453bac583808c9f165a85c2 ]

aac_probe_one() calls hardware-specific init functions through the
aac_driver_ident::init pointer, all of which eventually call down to
aac_init_adapter().

If aac_init_adapter() fails after allocating memory for aac_dev::queues,
it frees the memory but does not clear that member.

After the hardware-specific init function returns an error,
aac_probe_one() goes down an error path that frees the memory pointed to
by aac_dev::queues, resulting.in a double-free.

Reported-by: default avatarMichael Gordon <m.gordon.zelenoborsky@gmail.com>
Link: https://bugs.debian.org/1075855


Fixes: 8e0c5ebd ("[SCSI] aacraid: Newer adapter communication iterface support")
Signed-off-by: default avatarBen Hutchings <benh@debian.org>
Link: https://lore.kernel.org/r/ZsZvfqlQMveoL5KQ@decadent.org.uk


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0e9d60d0

drivers/scsi/aacraid/comminit.c

+2 −0
Original line number Diff line number Diff line
@@ -652,6 +652,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev) 


	if (aac_comm_init(dev)<0){

		kfree(dev->queues);

		dev->queues = NULL;

		return NULL;

	}

	/*
@@ -659,6 +660,7 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev) 
	 */

	if (aac_fib_setup(dev) < 0) {

		kfree(dev->queues);

		dev->queues = NULL;

		return NULL;

	}