From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35CBCC433FF for ; Wed, 14 Aug 2019 02:24:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0497220842 for ; Wed, 14 Aug 2019 02:24:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565749491; bh=8lbmIY1aOT4JZP/B0nvlZvq0dITQdhB1j8LjOqmC96o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wBSTaeE7ZQeMxvrj5z0aNubaicAU55cyv5jII5NrzYJzlso32AuouXnA9eRYHRwHk DWdUO4CIKCK4Chia0PiAdv3SdGfCXz+Z3JeYLyPQVIn0smgxJ/wzr6Nrxi2VO4bS4k I7HD0k5jrPpcAN+vNdGMbyUM3ZAKBW3nTb0YFkgw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728277AbfHNCYM (ORCPT ); Tue, 13 Aug 2019 22:24:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:53076 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730102AbfHNCYL (ORCPT ); Tue, 13 Aug 2019 22:24:11 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 233CE216F4; Wed, 14 Aug 2019 02:24:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565749450; bh=8lbmIY1aOT4JZP/B0nvlZvq0dITQdhB1j8LjOqmC96o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E+uUi4baBRd111IbbisGx7nZlCdfxxeZxhggP2JSdRmHKsfl3s2kNQrTYfIWurI8n ksEpKHXIR+nFFR1va7bCxh/SHkNQHDpeIiGENRAtC+UlTVxSn2vOk9qEpIiwgGl04c ti5h3wywX7GsAw2CcRPliR5uxzj1XYEIUwF/L9Ws= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jens Axboe , Kees Cook , Sasha Levin , linux-ide@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 29/33] libata: add SG safety checks in SFF pio transfers Date: Tue, 13 Aug 2019 22:23:19 -0400 Message-Id: <20190814022323.17111-29-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814022323.17111-1-sashal@kernel.org> References: <20190814022323.17111-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Jens Axboe [ Upstream commit 752ead44491e8c91e14d7079625c5916b30921c5 ] Abort processing of a command if we run out of mapped data in the SG list. This should never happen, but a previous bug caused it to be possible. Play it safe and attempt to abort nicely if we don't have more SG segments left. Reviewed-by: Kees Cook Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/ata/libata-sff.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index 8d22acdf90f0b..0e2bc5b9a78c1 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c @@ -703,6 +703,10 @@ static void ata_pio_sector(struct ata_queued_cmd *qc) unsigned int offset; unsigned char *buf; + if (!qc->cursg) { + qc->curbytes = qc->nbytes; + return; + } if (qc->curbytes == qc->nbytes - qc->sect_size) ap->hsm_task_state = HSM_ST_LAST; @@ -742,6 +746,8 @@ static void ata_pio_sector(struct ata_queued_cmd *qc) if (qc->cursg_ofs == qc->cursg->length) { qc->cursg = sg_next(qc->cursg); + if (!qc->cursg) + ap->hsm_task_state = HSM_ST_LAST; qc->cursg_ofs = 0; } } -- 2.20.1