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=ham 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 9FF93C43331 for ; Sun, 10 Nov 2019 02:54:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 68C3A21019 for ; Sun, 10 Nov 2019 02:54:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573354464; bh=42CYjEfByef5fyj2v+6dXNq1j0eelE7rbuPTQ5RZEIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cfUwpGFbmdXd3pK2IV4GvgKoZXWmLvimX3RN1DmeEgXsYSI8koU2RZZW4xZKMoXMb 91hbE66Qe+kaRtTj2L9etTIKQHiOVDFwRifMQbOEYYLneTSEvII+JXrnUQjXv8xRVb 39loxVx02ZZpk8e6Rd+aodxeC1pcU17w0efdjMJ8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729805AbfKJCuu (ORCPT ); Sat, 9 Nov 2019 21:50:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:33500 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727771AbfKJCuT (ORCPT ); Sat, 9 Nov 2019 21:50:19 -0500 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 6F27C22790; Sun, 10 Nov 2019 02:50:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573354219; bh=42CYjEfByef5fyj2v+6dXNq1j0eelE7rbuPTQ5RZEIk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VMreHRQtLlqKWLjAwHvorzuR2LvVGoFK62PSFscpEKg7q8abMtc5o+b4uj98YVcAy 2LJcOkM1EylCT1rmFwP9IMyO6cDC0YhwhEOKv4+sF9eskIjMXHxENb5+18gP6z5phg MAl+eV+acA5ORULURNSiWZg2NgSk4h9vK/Y3lgxM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Finn Thain , Michael Schmitz , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 57/66] scsi: NCR5380: Check for invalid reselection target Date: Sat, 9 Nov 2019 21:48:36 -0500 Message-Id: <20191110024846.32598-57-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191110024846.32598-1-sashal@kernel.org> References: <20191110024846.32598-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Finn Thain [ Upstream commit 7ef55f6744c45e3d7c85a3f74ada39b67ac741dd ] The X3T9.2 specification (draft) says, under "6.1.4.1 RESELECTION", that "the initiator shall not respond to a RESELECTION phase if other than two SCSI ID bits are on the DATA BUS." This issue (too many bits set) has been observed in the wild, so add a check. Tested-by: Michael Schmitz Signed-off-by: Finn Thain Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/NCR5380.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 35419ba32c467..15c0fff7519be 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c @@ -2102,6 +2102,11 @@ static void NCR5380_reselect(struct Scsi_Host *instance) NCR5380_write(MODE_REG, MR_BASE); target_mask = NCR5380_read(CURRENT_SCSI_DATA_REG) & ~(hostdata->id_mask); + if (!target_mask || target_mask & (target_mask - 1)) { + shost_printk(KERN_WARNING, instance, + "reselect: bad target_mask 0x%02x\n", target_mask); + return; + } dsprintk(NDEBUG_RESELECTION, instance, "reselect\n"); -- 2.20.1