Skip to contentSkip to conversation

libata: check cdb len per dev instead of per host

PATCH NAK Mark Lord 2 participants 3 messages Feb 1, 2007 libata

lore
Share & tools
lore

Mark Lord

author
#0 lore raw

PATCH 1/1 libata: check cdb len per dev instead of per host

Fix libata to perform CDB len validation per device rather than per host. This way, validation still works when we have a mix of 12-byte and 16-byte devices on a common host interface.

---

drivers/ata/libata-core.c +0 -0
diff -u --recursive --new-file --exclude-from=old//Documentation/dontdiff old/drivers/ata/libata-core.c linux/drivers/ata/libata-core.c
@@ -1573,20 +1573,6 @@
		snprintf(desc, desc_sz, "NCQ (depth %d/%d)", hdepth, ddepth);
}

-static void ata_set_port_max_cmd_len(struct ata_port *ap) -{
- int i;
-
- if (ap->scsi_host) {
- unsigned int len = 0;
-
- for (i = 0; i < ATA_MAX_DEVICES; i++)
- len = max(len, ap->device[i].cdb_len);
-
- ap->scsi_host->max_cmd_len = len;
- }
-}
-
/**
* ata_dev_configure - Configure the specified ATA/ATAPI device
* @dev: Target device to configure
@@ -1767,8 +1753,6 @@

		}
	}

- ata_set_port_max_cmd_len(ap);
-

	/* limit bridge transfers to udma5, 200 sectors */
	if (ata_dev_knobble(dev)) {
		if (ata_msg_drv(ap) && print_info)
@@ -5660,7 +5644,7 @@
	shost->max_id = 16;
	shost->max_lun = 1;
	shost->max_channel = 1;

- shost->max_cmd_len = 12;
+ shost->max_cmd_len = 16;
}

/**

drivers/ata/libata-scsi.c +0 -0
diff -u --recursive --new-file --exclude-from=old//Documentation/dontdiff old/drivers/ata/libata-scsi.c linux/drivers/ata/libata-scsi.c
@@ -2750,8 +2750,10 @@
{
	int rc = 0;

- if (unlikely(!scmd->cmd_len)) {
- ata_dev_printk(dev, KERN_WARNING, "WARNING: zero len CDB\n");
+ if (unlikely(!scmd->cmd_len || scmd->cmd_len > dev->cdb_len)) {
+ ata_dev_printk(dev, KERN_WARNING,
+ "WARNING: bad CDB len=%u, max=%u\n",

+			scmd->cmd_len, dev->cdb_len);
		scmd->result = DID_ERROR << 16;
		done(scmd);
		return 0;
NAK
#1 lore raw
Quoted 4 lines · On Thu, 01 Feb 2007 11:58:09 -0500 Mark Lord <[email protected]> wrote:

Fix libata to perform CDB len validation per device rather than per host. This way, validation still works when we have a mix of 12-byte and 16-byte devices on a common host interface.#

Users can pass 16byte commands in the "safe" list of commands so can spam the log via the printk

NAK

author
#2 lore raw
Quoted 10 lines · Alan
Quoted 4 lines · On Thu, 01 Feb 2007 11:58:09 -0500 Mark Lord <[email protected]> wrote:

Fix libata to perform CDB len validation per device rather than per host. This way, validation still works when we have a mix of 12-byte and 16-byte devices on a common host interface.#

Users can pass 16byte commands in the "safe" list of commands so can spam the log via the printk

That's nothing new.
We can do that already today with the original existing printk().

This patch (below) gets rid of the offending printk(), replacing it instead with DPRINTK.

---

drivers/ata/libata-scsi.c renamed from drivers/ata/libata-scsi.c.orig +0 -0
@@ -2762,8 +2762,7 @@
		max_len = dev->cdb_len;
 
	if (unlikely(!scmd->cmd_len || scmd->cmd_len > max_len)) {
- 		ata_dev_printk(dev, KERN_WARNING,
- 			"WARNING: bad CDB len=%u, max=%u\n",
+ 		DPRINTK("bad CDB len=%u, max=%u\n",
 			scmd->cmd_len, max_len);
		scmd->result = DID_ERROR << 16;
		done(scmd);