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 1537DC41514 for ; Wed, 14 Aug 2019 02:15:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D451B2084D for ; Wed, 14 Aug 2019 02:15:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565748921; bh=TMywJLHmRFOLnAVh2Tbe3MsCljS5poxTK8G5/GkDT0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mt8HGnoCzlE3gnwwwotRm6Q2oT6YZ6RipriswuoZftafOOiCiRWu+UXCmGoWZdikQ sOE6flstEvpl0VdjohgSyqu6tRAYQuNZTYplWUDn4JFOMBRi/9zxFsg0p57V6zqUgs /P5pu/za1codfYJQrMAV7pXFMSfBQUU/YE8JGlEI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728735AbfHNCO0 (ORCPT ); Tue, 13 Aug 2019 22:14:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:46352 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728730AbfHNCO0 (ORCPT ); Tue, 13 Aug 2019 22:14:26 -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 6EAEF2133F; Wed, 14 Aug 2019 02:14:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565748865; bh=TMywJLHmRFOLnAVh2Tbe3MsCljS5poxTK8G5/GkDT0w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VHbYEO18VAD9lYsEIOI9N1OcZCytXL10S0sKP8KYUyJG+xvE5urMSROcbip5Md7sO 8oPuywP3ixm8n4Xw6pTYCkfTN58dGADMtVdF7FzTxKrRUa+Za1fzZ7IFHYanbBxCye oDtWGNfm7HeLLD2+YNasI6N+66dCb64PWrlqx85A= 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 5.2 112/123] libata: add SG safety checks in SFF pio transfers Date: Tue, 13 Aug 2019 22:10:36 -0400 Message-Id: <20190814021047.14828-112-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814021047.14828-1-sashal@kernel.org> References: <20190814021047.14828-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 10aa278821427..4f115adb4ee83 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c @@ -658,6 +658,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; @@ -683,6 +687,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