From patchwork Thu Mar 1 15:27:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130270 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2951716edc; Thu, 1 Mar 2018 07:37:56 -0800 (PST) X-Google-Smtp-Source: AG47ELvkB3f58x4hOzcu5l8+26p+3JcbuBQgetUXTkyUFqfUpj2dXskf1V25+vjwkDw7C5LHInDe X-Received: by 10.101.69.205 with SMTP id m13mr1888477pgr.323.1519918676760; Thu, 01 Mar 2018 07:37:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918676; cv=none; d=google.com; s=arc-20160816; b=yrFBG3liqkZAIXhR6VeLuDSmlt/eercV8PAx6bJzEAPLRN+oILVJZtALmKmb3AmIgF tKhpegMcNOsg9PsPLaVl22FYTfO+Kxg2dIGiJLIX06hd3+RQrkd88sg+jcH+wuL8RgZ8 OhSg5DLhfKGy7HVhEfZ3Rsh/gQ7GpL4EbV3e9TeEdG3khOTZF5wCbkKoB35mjwn0jmXL JhBAj0eQzrLIgsukgY4FqzG/oLUvkq06tB9ZSqR6lU3no5CIU5SFwYzcwos2Ce2V6e7x i9d3ieh/c6mP7haIsdfgvCHztGDXnPNOlVFAZxIhms7E7b7DbRsDbl0XYJGnA4sfNdms Mq+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=xHOYaCq6/8FwRvmm1VLujobTKaAr/M+3SpIL8CCWV6U=; b=BxNAkGvYt9b2P713GSWf4XsMIeYYHyZZUhaWdkKCrRBEeq8YM9lKY3AF5eiPssKj5r kV/SpigqguaYs2YEBJIWvS95jLwP8oq48J746muwXCvSOxV5D+mT1JiqPz3GLUoqj+P0 p2XYgh5otB8JEG21RbEWkaz1RlrNLbc1LqLxvM2hiiTIPwJQW9RB+W9y5D9IpxXzJFMx jr9Gp6M3R4lBaCVrKMjij5XkteCGgrbkyT6USFiAPGmvMBbpg2rJbRF7m8mThMtU7aNb D4Cxvjvoi7gpILSPTkaQ2hi0zPHJEKH5jUCyqA8eXBuUzo3H93GCGTIvhEbD1X7Ond9Y nloQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=THHRJgoc; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g10-v6si2863008plk.730.2018.03.01.07.37.56; Thu, 01 Mar 2018 07:37:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=THHRJgoc; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032531AbeCAPhw (ORCPT + 10 others); Thu, 1 Mar 2018 10:37:52 -0500 Received: from mail-by2nam03on0132.outbound.protection.outlook.com ([104.47.42.132]:24496 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032516AbeCAPhr (ORCPT ); Thu, 1 Mar 2018 10:37:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=xHOYaCq6/8FwRvmm1VLujobTKaAr/M+3SpIL8CCWV6U=; b=THHRJgocoqULUwD2+0exyLlfcipKk4JkKnAZ5ffxUaMUE/A80JXI218S9GD2fJicwhSJ9rBAOQIadGogzAcJ02dCJdpwXTK4yefXBuq9CUPldMroC+3dYfL0bOfHq08qV0Tw1tPaluNr0XwFMVq7Cv2JWn8ti7ybQkw/vtsg0Ho= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1014.namprd21.prod.outlook.com (52.132.133.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.3; Thu, 1 Mar 2018 15:37:42 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:37:42 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , "Martin K . Petersen" , Sasha Levin Subject: [added to the 4.1 stable tree] scsi: advansys: fix uninitialized data access Thread-Topic: [added to the 4.1 stable tree] scsi: advansys: fix uninitialized data access Thread-Index: AQHTsXHDj3Ek24Ie7EKBcrUxOnFTXQ== Date: Thu, 1 Mar 2018 15:27:10 +0000 Message-ID: <20180301152116.1486-437-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-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; DM5PR2101MB1014; 7:d/T9JmWsNlRyZ/JVF03HqhNMYoYEHPDFhJdZsXORikvP7sy4VJJMmVi7qORJtMKrXRKUIEApIGrlsgyRemOSsHbQch7Pz3vWuesXOJ1g3ta4F49zBB5yicEIOIg+0Es4Q08vHXk3cns//zr81rPrW07MNrn3FrNQ6k0XnrGNn/MGVjmovLnV9awzErphjJVlGTsQnSdK92pDnmizE2DM0DBUfUrIWc6c2Mk3nUB2ZeOc2Ct/NwcEg1qYIrLpk/ML x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 8c753ee7-0e86-4c38-2610-08d57f8a5fa4 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB1014; x-ms-traffictypediagnostic: DM5PR2101MB1014: 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)(8121501046)(5005006)(3231220)(944501228)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB1014; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1014; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(346002)(39860400002)(376002)(396003)(199004)(189003)(53936002)(2906002)(3280700002)(6436002)(6486002)(3846002)(6512007)(2900100001)(6116002)(2950100002)(107886003)(6666003)(72206003)(5660300001)(36756003)(10090500001)(3660700001)(14454004)(7736002)(305945005)(97736004)(1076002)(22452003)(26005)(6506007)(105586002)(86362001)(575784001)(59450400001)(478600001)(68736007)(102836004)(4326008)(6346003)(54906003)(110136005)(81156014)(81166006)(86612001)(8936002)(186003)(10290500003)(8676002)(76176011)(316002)(2501003)(66066001)(25786009)(5250100002)(106356001)(99286004)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1014; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: tnBGuWEkZA7OPPvMISqiMbY51vPteyz8kN607nGOAA4Hu87HHO9yyleoHeb3DgQwQf91y1G4M6ipf+l58WwcfOomZ5hmItj1CsPVw2lMGbpGs+l2xwJorhIj2qJCQ8CQMovRwWvuZ/gRI3PBeh9OUKVh8G+WUimgENbRihJAJf4= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c753ee7-0e86-4c38-2610-08d57f8a5fa4 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:27:10.0630 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1014 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit 44a5b977128c0ffff0654392b40f4c2ce72a619b ] gcc-7.0.1 now warns about a previously unnoticed access of uninitialized struct members: drivers/scsi/advansys.c: In function 'AscMsgOutSDTR': drivers/scsi/advansys.c:3860:26: error: '*((void *)&sdtr_buf+5)' may be used uninitialized in this function [-Werror=maybe-uninitialized] ((ushort)s_buffer[i + 1] << 8) | s_buffer[i]); ^ drivers/scsi/advansys.c:3860:26: error: '*((void *)&sdtr_buf+7)' may be used uninitialized in this function [-Werror=maybe-uninitialized] drivers/scsi/advansys.c:3860:26: error: '*((void *)&sdtr_buf+5)' may be used uninitialized in this function [-Werror=maybe-uninitialized] drivers/scsi/advansys.c:3860:26: error: '*((void *)&sdtr_buf+7)' may be used uninitialized in this function [-Werror=maybe-uninitialized] The code has existed in this exact form at least since v2.6.12, and the warning seems correct. This uses named initializers to ensure we initialize all members of the structure. Signed-off-by: Arnd Bergmann Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/advansys.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index 969469261353..42a14c456da0 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c @@ -6482,18 +6482,17 @@ static uchar AscGetSynPeriodIndex(ASC_DVC_VAR *asc_dvc, uchar syn_time) static uchar AscMsgOutSDTR(ASC_DVC_VAR *asc_dvc, uchar sdtr_period, uchar sdtr_offset) { - EXT_MSG sdtr_buf; - uchar sdtr_period_index; - PortAddr iop_base; - - iop_base = asc_dvc->iop_base; - sdtr_buf.msg_type = EXTENDED_MESSAGE; - sdtr_buf.msg_len = MS_SDTR_LEN; - sdtr_buf.msg_req = EXTENDED_SDTR; - sdtr_buf.xfer_period = sdtr_period; + PortAddr iop_base = asc_dvc->iop_base; + uchar sdtr_period_index = AscGetSynPeriodIndex(asc_dvc, sdtr_period); + EXT_MSG sdtr_buf = { + .msg_type = EXTENDED_MESSAGE, + .msg_len = MS_SDTR_LEN, + .msg_req = EXTENDED_SDTR, + .xfer_period = sdtr_period, + .req_ack_offset = sdtr_offset, + }; sdtr_offset &= ASC_SYN_MAX_OFFSET; - sdtr_buf.req_ack_offset = sdtr_offset; - sdtr_period_index = AscGetSynPeriodIndex(asc_dvc, sdtr_period); + if (sdtr_period_index <= asc_dvc->max_sdtr_index) { AscMemWordCopyPtrToLram(iop_base, ASCV_MSGOUT_BEG, (uchar *)&sdtr_buf,