1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index e9364434182c..7d41afe8ccbc 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2792,8 +2792,9 @@ static inline int __ata_scsi_queuecmd(struct scsi_cmnd *scmd,
 {
         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)) {
+                DPRINTK("bad CDB len=%u, max=%u\n",
+                        scmd->cmd_len, dev->cdb_len);
                 scmd->result = DID_ERROR << 16;
                 done(scmd);
                 return 0;