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=HEADER_FROM_DIFFERENT_DOMAINS, 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 382D9C2BA19 for ; Sun, 5 Apr 2020 23:13:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03F0220678 for ; Sun, 5 Apr 2020 23:13:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727509AbgDEXNr (ORCPT ); Sun, 5 Apr 2020 19:13:47 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:37638 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726887AbgDEXNr (ORCPT ); Sun, 5 Apr 2020 19:13:47 -0400 Received: by mail-pl1-f196.google.com with SMTP id x1so5176748plm.4 for ; Sun, 05 Apr 2020 16:13:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0xq5JalltONl9PizfeV42lmM2AY/Ve5nHbOH//HbKF8=; b=XZR1yNmvvByUavcS2I/wFpV35Ujgphd4qM1DR+ROzW093ZP6rnUJ/u+MRkFFm4HZLn hFqNgUhyW1X87Wklskjuevj/MG+YP3HiRlj2sFLWM4qN7FRwyMFzI/Ano12Fgb0m7E4F BNSyUJWdRUZEy3CA+RH0LHXP3XJywKo/XCnqSvjD9guAlWwj62rzWYgjenyCVp98kby2 Oo2AxMJNLXD22Gojt/M380QcHHeasJyV2WtkexF1oEFg99bj/mha7XX4tBtRcoRPFipI L3+/DEgtSwOuehV+nFk2DHVoaT9nM571jiJo1Rle7xzLg6Ehn3f0+tj5SVrvNmrLcYyB KxHg== X-Gm-Message-State: AGi0PuampIIh18EMZLz1r4he9JOXeZ+NFiIZFgBerv+biaf4SFkDPhKk LdWPqHteTw7KYlsuxRoXejI= X-Google-Smtp-Source: APiQypLGtV1JVvJ/WQkxkgzHmLY4yPVyj5HRw/6OEHAdLvEKC+/f7W3zQzKmEgkg1y9VP0yrF0qAKw== X-Received: by 2002:a17:90b:254:: with SMTP id fz20mr23245223pjb.27.1586128426125; Sun, 05 Apr 2020 16:13:46 -0700 (PDT) Received: from asus.hsd1.ca.comcast.net ([2601:647:4000:d7:7d7b:4f16:40c2:d1f9]) by smtp.gmail.com with ESMTPSA id q7sm10319084pfc.166.2020.04.05.16.13.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Apr 2020 16:13:45 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" , "James E . J . Bottomley" Cc: linux-scsi@vger.kernel.org, Bart Van Assche , Nilesh Javali , Himanshu Madhani , Quinn Tran , Martin Wilck , Daniel Wagner , Roman Bolshakov Subject: [PATCH] qla2xxx: Increase the size of struct qla_fcp_prio_cfg to FCP_PRIO_CFG_SIZE Date: Sun, 5 Apr 2020 16:13:39 -0700 Message-Id: <20200405231339.29612-1-bvanassche@acm.org> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org This patch fixes the following Coverity complaint without changing any functionality: CID 337793 (#1 of 1): Wrong size argument (SIZEOF_MISMATCH) suspicious_sizeof: Passing argument ha->fcp_prio_cfg of type struct qla_fcp_prio_cfg * and argument 32768UL to function memset is suspicious because a multiple of sizeof (struct qla_fcp_prio_cfg) /*48*/ is expected. memset(ha->fcp_prio_cfg, 0, FCP_PRIO_CFG_SIZE); Cc: Nilesh Javali Cc: Himanshu Madhani Cc: Quinn Tran Cc: Martin Wilck Cc: Daniel Wagner Cc: Roman Bolshakov Signed-off-by: Bart Van Assche --- drivers/scsi/qla2xxx/qla_fw.h | 3 ++- drivers/scsi/qla2xxx/qla_os.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h index f9bad5bd7198..647e67c6ba5e 100644 --- a/drivers/scsi/qla2xxx/qla_fw.h +++ b/drivers/scsi/qla2xxx/qla_fw.h @@ -2217,8 +2217,9 @@ struct qla_fcp_prio_cfg { #define FCP_PRIO_ATTR_PERSIST 0x2 uint8_t reserved; /* Reserved for future use */ #define FCP_PRIO_CFG_HDR_SIZE 0x10 - struct qla_fcp_prio_entry entry[1]; /* fcp priority entries */ + struct qla_fcp_prio_entry entry[1023]; /* fcp priority entries */ #define FCP_PRIO_CFG_ENTRY_SIZE 0x20 + uint8_t reserved2[16]; }; #define FCP_PRIO_CFG_SIZE (32*1024) /* fcp prio data per port*/ diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index d9072ea7c42b..784f3e553f15 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -7840,6 +7840,7 @@ qla2x00_module_init(void) BUILD_BUG_ON(sizeof(struct vf_evfp_entry_24xx) != 56); BUILD_BUG_ON(sizeof(struct qla_flt_region) != 16); BUILD_BUG_ON(sizeof(struct qla_flt_header) != 8); + BUILD_BUG_ON(sizeof(struct qla_fcp_prio_cfg) != FCP_PRIO_CFG_SIZE); /* Allocate cache for SRBs. */ srb_cachep = kmem_cache_create("qla2xxx_srbs", sizeof(srb_t), 0,