Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1171275yba; Thu, 9 May 2019 11:56:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqwgfkFFbhecgivDYlgHmpOp2oRNW3pLHfw4FNMD8fwdiVyXcCGCjktC7voTvLSU671gmVne X-Received: by 2002:a63:1555:: with SMTP id 21mr7826261pgv.204.1557428218704; Thu, 09 May 2019 11:56:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557428218; cv=none; d=google.com; s=arc-20160816; b=B79umJsXkTFXuGVdeJuuOOWu/H8BSDSozmdzoJ8mZu8D9AL3OB5kmy/21FQO5Z8DOE LfnmAohmnoJuzLVKB2MalB4gSAa5ZZJt20oUFN/+5YOk+VYduQiwwv6uPHn08ABO7+FA KEr1V/p5dnzYpgULHqA0onCfrDGucIhvn50KzGdI9p55dx2TBsneeyjeOnvzS5RPLPRw yWFnOlj4wNI5aXAI260JxtrHivoHNLvqWYpLfrFuFmU8ohRX4JtxZgRA9paFW0dOuMiQ qsX4xqyONpRN8S9+2SNzPz/ydZEZd3/SvGho+k5ySDt3b/iP4IjFFmYht+teu2I2k61c AyUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=u1yxcY+VAvS4VSkiNoy48R+e/rZ0CLlRWDoE1MvuKl8=; b=a28f2QwKkYm+ncDe1w6U+3RAJUMj6YiVnVobx3EW4YPcjf0iguFSlpZDTgE+5QmA/5 X1Bx24sRsueAYL9zO2dfOsKOnOHwxL0mjG3l2E8RIfAhHeQaUy8+8AXli7q2z7n2ygqV emtAiQ0l6qhk5/lM7kdB1eI5WvQhszdHoStWsmp3+T8L8HE73XrS9sfiptV4IJXnQo8y UPYqkv6rqPzgQW6IqUhgZ1ovSj9Gipds64+HdkgHakuqKi78tGZAPVEotR0MJN7+dGri 9J55AqfoH1HZFxVp9wLjDCfCXcGzjupIIy0Cj0OqeqIWtr+2Q9q95GFJ11Ee/CATKj7Q 6aew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QRTslW1G; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s16si4165793pga.544.2019.05.09.11.56.42; Thu, 09 May 2019 11:56:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@kernel.org header.s=default header.b=QRTslW1G; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729118AbfEISyn (ORCPT + 99 others); Thu, 9 May 2019 14:54:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:49590 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729110AbfEISyl (ORCPT ); Thu, 9 May 2019 14:54:41 -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 D6DD7204FD; Thu, 9 May 2019 18:54:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557428081; bh=AvzCBlu9b21RH+Bn5XnyCH1lsWQ02IjRZ9x6cTTvQXM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QRTslW1G8pLPTB17HhY6LZGSEu+M7eJhC2oAnjSgOCH0WM4oIuCf2wWQYebIacqJ+ JWNaA7dfNAWT2HfUqJtQG+vTTW+/2f2bOt32CcThjeQXt3YFiGT614CUT6Y0HRxCoN oKjNNd/ivTotlrA4SBmijrkQ7fpwzToEfpW1vl3E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrew Vasquez , Himanshu Madhani , "Martin K. Petersen" Subject: [PATCH 5.1 19/30] scsi: qla2xxx: Fix incorrect region-size setting in optrom SYSFS routines Date: Thu, 9 May 2019 20:42:51 +0200 Message-Id: <20190509181254.999527801@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190509181250.417203112@linuxfoundation.org> References: <20190509181250.417203112@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrew Vasquez commit 5cbdae10bf11f96e30b4d14de7b08c8b490e903c upstream. Commit e6f77540c067 ("scsi: qla2xxx: Fix an integer overflow in sysfs code") incorrectly set 'optrom_region_size' to 'start+size', which can overflow option-rom boundaries when 'start' is non-zero. Continue setting optrom_region_size to the proper adjusted value of 'size'. Fixes: e6f77540c067 ("scsi: qla2xxx: Fix an integer overflow in sysfs code") Cc: stable@vger.kernel.org Signed-off-by: Andrew Vasquez Signed-off-by: Himanshu Madhani Signed-off-by: Martin K. Petersen Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/qla2xxx/qla_attr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c @@ -364,7 +364,7 @@ qla2x00_sysfs_write_optrom_ctl(struct fi } ha->optrom_region_start = start; - ha->optrom_region_size = start + size; + ha->optrom_region_size = size; ha->optrom_state = QLA_SREADING; ha->optrom_buffer = vmalloc(ha->optrom_region_size); @@ -437,7 +437,7 @@ qla2x00_sysfs_write_optrom_ctl(struct fi } ha->optrom_region_start = start; - ha->optrom_region_size = start + size; + ha->optrom_region_size = size; ha->optrom_state = QLA_SWRITING; ha->optrom_buffer = vmalloc(ha->optrom_region_size);