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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 16D45C3A5A8 for ; Wed, 4 Sep 2019 18:25:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D960D20870 for ; Wed, 4 Sep 2019 18:25:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567621547; bh=2g1bI4KN1ApHiOeyVHDMfszUuoz6nRsnAGam2R0nwMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2MBj2c613ThnObLF0+1kbiBzpuqUyTKafiX+zzmdYGA8EHW0b+R9bjljFCrC2Cook vlVot7nsTckpLDnez6TtfWP1W/50UHJMMnRWUcgyFNjYZjF4igjhxHSB9gWyyOVcB3 UNqqhi2PKm6d28r3JsaoFYrfve2mFTeqx9giLaiM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387875AbfIDR72 (ORCPT ); Wed, 4 Sep 2019 13:59:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:38336 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731940AbfIDR72 (ORCPT ); Wed, 4 Sep 2019 13:59:28 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C017621883; Wed, 4 Sep 2019 17:59:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567619967; bh=2g1bI4KN1ApHiOeyVHDMfszUuoz6nRsnAGam2R0nwMs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W4JIfQACoxeO7FoDWtR62UsHlm+B1CMLlhgETBvShS6LsJAb/X9wE/+S/gCqf4i3z OsW4PFruXl1y1LSWMEsGENX3FYXpWm1Goekt5cjAIELx9Nozou9V3EU0C9nsQIw6T5 WPuRVLIiz0YW8JHBuivcwyUAkD04N2UizysU5ym0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kees Cook , Jens Axboe , Sasha Levin Subject: [PATCH 4.9 23/83] libata: add SG safety checks in SFF pio transfers Date: Wed, 4 Sep 2019 19:53:15 +0200 Message-Id: <20190904175305.914660523@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190904175303.488266791@linuxfoundation.org> References: <20190904175303.488266791@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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