]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
mtip32xx: fix potential crash on SEC_ERASE_UNIT
authorSelvan Mani <smani@micron.com>
Wed, 7 Nov 2012 13:03:37 +0000 (06:03 -0700)
committerJens Axboe <axboe@kernel.dk>
Fri, 23 Nov 2012 13:32:54 +0000 (14:32 +0100)
The mtip driver lifted this code from elsewhere and then added a special
handling check for SEC_ERASE_UNIT. If the caller tries to do a security
erase but passes no output data for the command then outbuf is not
allocated and the driver duly explodes.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Selvan Mani <smani@micron.com>
Signed-off-by: Asai Thambi S P <asamymuthupa@micron.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/mtip32xx/mtip32xx.c

index adc6f36564cf3c9f214ca37c9b3cf8faffbe6cf8..dfb7196bbde9551ff93701bc4e312cbd63d58dd3 100644 (file)
@@ -2218,8 +2218,8 @@ static int exec_drive_taskfile(struct driver_data *dd,
                fis.device);
 
        /* check for erase mode support during secure erase.*/
-       if ((fis.command == ATA_CMD_SEC_ERASE_UNIT)
-                                       && (outbuf[0] & MTIP_SEC_ERASE_MODE)) {
+       if ((fis.command == ATA_CMD_SEC_ERASE_UNIT) && outbuf &&
+                                       (outbuf[0] & MTIP_SEC_ERASE_MODE)) {
                erasemode = 1;
        }