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

Commit 705d2014 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Jeff Garzik
Browse files

libata: add missing NULL pointer check to ata_eh_reset() 



drivers/ata/libata-eh.c +2403 ata_eh_reset(80) warning: variable derefenced before check 'slave'

Please note that this is _not_ a real bug at the moment since ata_eh_context
structure is embedded into ata_list structure and the code alwas checks for
'slave' before accessing 'sehc'.

Anyway lets add missing check and always have a valid 'sehc' pointer (which
makes code easier to understand and prevents introducing some possible bugs
in the future).

Reported-by: default avatarDan Carpenter <error27@gmail.com>
Cc: corbet@lwn.net
Cc: eteo@redhat.com
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 044dcc82

drivers/ata/libata-eh.c

+1 −1
Original line number Diff line number Diff line
@@ -2327,7 +2327,7 @@ int ata_eh_reset(struct ata_link *link, int classify, 
	struct ata_port *ap = link->ap;

	struct ata_link *slave = ap->slave_link;

	struct ata_eh_context *ehc = &link->eh_context;

	struct ata_eh_context *sehc = &slave->eh_context;

	struct ata_eh_context *sehc = slave ? &slave->eh_context : NULL;

	unsigned int *classes = ehc->classes;

	unsigned int lflags = link->flags;

	int verbose = !(ehc->i.flags & ATA_EHI_QUIET);