From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1153505-1520116246-2-11102203029906580949 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.249, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1520116245; b=hE+WLXGACsBjByvoYuN7m0qYxd1viflT8hFc9xe5P9z6mEd YZ1Gvc7XVVta/r9pfL9Jwdwvv1ZlSTriXXId2RaXxqQc0Aa90qVrFp4pY4fZjWCy SekAymJSWEF9djw2yg2jiHJIxgSzDrVvgkfcAlIk2RqGWv7j/1qKPyr4Zee8b1sA g5q2cb04jnMlHyWsHz+j38c0lKRGshwSvZcjzEnIIQx/nlteZA+Tj3Sg84HAnrtg oTny44/BIK/OG4apKrKjdOFkjb4E/by/WM5ccAJQCA5uGhQBjTppn9MMjUrONqk6 OFJm4UUw3BFpmFnolVCTeLEK+xyYwCovlIojQOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1520116245; bh=EN84B3 Z4XAvv+ihltbQ5PojHh23Go5uO3kB9k0Giqpo=; b=IETjK5MeXPGd9TLYL4w4I6 lUztnDwWUTh7vVLhw+j0zt76PIlMOm8pXvmeBmkWBkcFyuM5WG82+sBDlKBAbx5I mU/bi1R1d1/RJfMOoGws/lWguN/tRNwws1qTCrJ+CasdIObLB4WK19dqHKmABqSm rfMa3Cic6KjRITIhg6AqHyoHbCJX9WTCrVY3LEEJe33bxGkMXFpaWUdk5CqWFyGh TfjWR5XNZB88YfIDnPQmvBPG03ao70cwtCFpMaSV1t3KniqanInHMIGInG1J7OvA arJDAWYzZdRPyCsy1EdevPRnZEAEerb7H1XuMwDrhtGErGedeS95r9nBzPTcjh2w == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=j3b6QZAW x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=j3b6QZAW x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933463AbeCCWaQ (ORCPT ); Sat, 3 Mar 2018 17:30:16 -0500 Received: from mail-bn3nam01on0135.outbound.protection.outlook.com ([104.47.33.135]:45024 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933058AbeCCWaN (ORCPT ); Sat, 3 Mar 2018 17:30:13 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Bart Van Assche , Christoph Hellwig , Hannes Reinecke , Johannes Thumshirn , "Martin K . Petersen" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 58/84] scsi: core: scsi_get_device_flags_keyed(): Always return device flags Thread-Topic: [PATCH AUTOSEL for 4.14 58/84] scsi: core: scsi_get_device_flags_keyed(): Always return device flags Thread-Index: AQHTsz6vM0K0tZGYu0eKK5kSuTdTYA== Date: Sat, 3 Mar 2018 22:26:33 +0000 Message-ID: <20180303222518.26271-58-alexander.levin@microsoft.com> References: <20180303222518.26271-1-alexander.levin@microsoft.com> In-Reply-To: <20180303222518.26271-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1065;7:xUHRGgYW0+zZ5cW0dyAKdIbsVVsE8w/VoqJ/VKBovO115sHZG31iC9D2RMONxCzeF55UTg30jYplT2offZICpwWUzF5Fh8VhNpcJU98UK75slr9nxZn1ymGFk/wk5i7eZX2/DtE4CpXS+MQun23tYHFyl4v2y0BItrLaArh9Zq4VE/3HSJ5s/4CWKRwXTE5iq8TPjrAIstzFHwomD3uWt3oCW75ciFYrgpKDn/FkoQNspuUBCT17swa2RUTJ7/wt x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: b81b550b-46f7-4081-79bb-08d58156521f x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1065; x-ms-traffictypediagnostic: MW2PR2101MB1065: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(146099531331640); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231220)(944501244)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123564045)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:MW2PR2101MB1065;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1065; x-forefront-prvs: 0600F93FE1 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(346002)(376002)(396003)(39380400002)(39860400002)(189003)(199004)(6506007)(22452003)(54906003)(25786009)(6666003)(186003)(2950100002)(102836004)(5250100002)(2501003)(110136005)(97736004)(316002)(2900100001)(36756003)(76176011)(6436002)(6486002)(26005)(4326008)(99286004)(68736007)(6512007)(6116002)(10090500001)(106356001)(105586002)(478600001)(66066001)(107886003)(3660700001)(305945005)(86612001)(14454004)(81166006)(7736002)(86362001)(575784001)(1076002)(72206003)(2906002)(10290500003)(8676002)(8936002)(81156014)(3846002)(5660300001)(3280700002)(53936002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1065;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; x-microsoft-antispam-message-info: jGit0GBYRYaWmiNDqlDq125GI7aafEtqEt3LoYGuY4cBEwKnWbQpWZPfljvTiiE7YZbl2X0uyEiUrVbS45UTw2IV+tsmH7dFYyuBcuHwnTMX6wtnkSNnw2dhHA1TKGYYC3jZQRzS5XTJtGTMeGHk4vxyU9B9/wyPHVWbpNvELoY= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: b81b550b-46f7-4081-79bb-08d58156521f X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2018 22:26:33.9004 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1065 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Bart Van Assche [ Upstream commit a44c9d36509c83cf64f33b93f6ab2e63822c01eb ] Since scsi_get_device_flags_keyed() callers do not check whether or not the returned value is an error code, change that function such that it returns a flags value even if the 'key' argument is invalid. Note: since commit 28a0bc4120d3 ("scsi: sd: Implement blacklist option for WRITE SAME w/ UNMAP") bit 31 is a valid device information flag so checking whether bit 31 is set in the return value is not sufficient to tell the difference between an error code and a flags value. Signed-off-by: Bart Van Assche Cc: Christoph Hellwig Cc: Hannes Reinecke Cc: Johannes Thumshirn Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/scsi_devinfo.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c index b19b00adacb2..42f0a1a6f689 100644 --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c @@ -595,17 +595,12 @@ int scsi_get_device_flags_keyed(struct scsi_device *s= dev, int key) { struct scsi_dev_info_list *devinfo; - int err; =20 devinfo =3D scsi_dev_info_list_find(vendor, model, key); if (!IS_ERR(devinfo)) return devinfo->flags; =20 - err =3D PTR_ERR(devinfo); - if (err !=3D -ENOENT) - return err; - - /* nothing found, return nothing */ + /* key or device not found: return nothing */ if (key !=3D SCSI_DEVINFO_GLOBAL) return 0; =20 --=20 2.14.1