Received: by 10.213.65.68 with SMTP id h4csp902964imn; Tue, 27 Mar 2018 10:53:38 -0700 (PDT) X-Google-Smtp-Source: AIpwx48ct8b6RvDg3lVjetyFoAPIP9HhD0iB2Lzz2MuEiwhM6cgA+uqD4hLRgCCnH32QXumQgsdF X-Received: by 10.101.92.138 with SMTP id a10mr210169pgt.64.1522173218709; Tue, 27 Mar 2018 10:53:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522173218; cv=none; d=google.com; s=arc-20160816; b=epbydkit/kBsvLysFWzjHu8EPL3vIA6OZq4b3opH9QcnhAHRXOgqEQeT2LpbAN7YOH K+ubYKLPTL5OlQz5zeDAGDstMt1GmTsQWdXmwayijOg/Je0t1bmkhgPx+D86sDNc7zyh /ek3Fk5bi9EUJok8UPbvb0oE8korhWOHy96/mRgy3i3WDezWSNZMC+xlEmKZO1Ww3Rel oKOZvNlMvlYt96O7Nfla0KAWnPVT8K7Zj5yQVTB7FUU3hHyBduJvMrQjlFL425OzZ4ff MK31wF6RvE2uLjZG/g+qccv+cINslMPbYQcK/K0HYGGh1Xi37Ojpf7+FFUvg5qqXIwU6 QRag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=hTx3fDKlmeMj+SxvwqfynxLFUrqCJ1CLk2Id39UX9xM=; b=BYW8iXUCF7S+H7HNwP+8HrDfFNFR9zcHZ2fhP5g+bdSwgS46z+zwLu5wCD3Cq7H0Ke 64l1zMKJqHT6OZU9Dt0uWSZqyWMJK7mS8g1BAIPXPQ/e0u7OB3tjUmuKyuwcTUJVyRKV GfCVlB2tVkeps1mlutpA1c6Oaus3kvxuZt/+i6XhT/1A4F+AYBkCTowPE5lotA+XSqTX fpnnkAPDcaEBxeaxwXXYhhAnKGUgSuOuhDw3LoKL9WUXFGaRgPH2FpM7zg/VoN6aYwIp 79w/4X2PP3clSz6krYRxKudRaaBqj/y5llnigYENiOdTgp0vZS7oGFyrOEUPkq4PSl75 vj4w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g3-v6si1542879plp.662.2018.03.27.10.53.24; Tue, 27 Mar 2018 10:53:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753559AbeC0QcN (ORCPT + 99 others); Tue, 27 Mar 2018 12:32:13 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:43236 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753539AbeC0QcK (ORCPT ); Tue, 27 Mar 2018 12:32:10 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 814DEF5A; Tue, 27 Mar 2018 16:32:09 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+2f69ca28df61bdfc77cd36af2e789850355a221e@syzkaller.appspotmail.com, Eric Biggers , Tejun Heo Subject: [PATCH 4.9 16/67] libata: dont try to pass through NCQ commands to non-NCQ devices Date: Tue, 27 Mar 2018 18:27:08 +0200 Message-Id: <20180327162727.589082775@linuxfoundation.org> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180327162726.702411083@linuxfoundation.org> References: <20180327162726.702411083@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Biggers commit 2c1ec6fda2d07044cda922ee25337cf5d4b429b3 upstream. syzkaller hit a WARN() in ata_bmdma_qc_issue() when writing to /dev/sg0. This happened because it issued an ATA pass-through command (ATA_16) where the protocol field indicated that NCQ should be used -- but the device did not support NCQ. We could just remove the WARN() from libata-sff.c, but the real problem seems to be that the SCSI -> ATA translation code passes through NCQ commands without verifying that the device actually supports NCQ. Fix this by adding the appropriate check to ata_scsi_pass_thru(). Here's reproducer that works in QEMU when /dev/sg0 refers to a disk of the default type ("82371SB PIIX3 IDE"): #include #include int main() { char buf[53] = { 0 }; buf[36] = 0x85; /* ATA_16 */ buf[37] = (12 << 1); /* FPDMA */ buf[38] = 0x1; /* Has data */ buf[51] = 0xC8; /* ATA_CMD_READ */ write(open("/dev/sg0", O_RDWR), buf, sizeof(buf)); } Fixes: ee7fb331c3ac ("libata: add support for NCQ commands for SG interface") Reported-by: syzbot+2f69ca28df61bdfc77cd36af2e789850355a221e@syzkaller.appspotmail.com Cc: # v4.4+ Signed-off-by: Eric Biggers Signed-off-by: Tejun Heo Signed-off-by: Greg Kroah-Hartman --- drivers/ata/libata-scsi.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -3226,6 +3226,12 @@ static unsigned int ata_scsi_pass_thru(s goto invalid_fld; } + /* We may not issue NCQ commands to devices not supporting NCQ */ + if (ata_is_ncq(tf->protocol) && !ata_ncq_enabled(dev)) { + fp = 1; + goto invalid_fld; + } + /* sanity check for pio multi commands */ if ((cdb[1] & 0xe0) && !is_multi_taskfile(tf)) { fp = 1;