Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3058485ybt; Mon, 29 Jun 2020 14:10:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXUDX5wsCSMKOuvgh1nWsh3Lz39nLf4bGJGSb/lrS7xpmVg/L4Csd3XfZi2muhjlxDFDcm X-Received: by 2002:a17:906:4e87:: with SMTP id v7mr3907770eju.242.1593465047651; Mon, 29 Jun 2020 14:10:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593465047; cv=none; d=google.com; s=arc-20160816; b=aiuweCwpLXWXXG4vLNuS6G0ySV/Spevrt0Dwv+6Mlr34s24LLEDXJ73DLu4+wdtyes bi+fq8lHzSBYQpN2xyD8b1TWa4DwH4qsk6rM+s3+Po9HIc1T7ubfBmANpZsjoIsbXOcf 2yMVIo7EdGs+0C3hsTUOfmsxcAg1QmkVJFw0bS0cHwMU/uohO7rkDhLdGDBDxPdH++hG GkndO4RZxNggoEJbfwYmi3Gp/xzOn0I01Ve5fDdcNfWU7v0S1AaMNZR6WknovrS0+P4e c5sLYQR1NwD8lk0uWimCcQFWLiRVnbbTe0kkhRA9k7xukKiEw5D+Fa9gjGTGHS4G9T3D nMKg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KB3/PYP48bH+ozSMpaxCQSiTHe9KXpOQ8K42DK/cZlg=; b=eEzgIjvUMTe2oN7Q3IK47eFrAbfUDU5nGUV22/4MRUhvQRtDbq6VLm3zFJvVEMHX10 absTRkI2zhSeLykWcsMTzgpw6nlV5EtUGRDd+0ZG8CzaFHrQEKM4wTGRq/6s4ZwlDzC3 8lc135NqjrgtsXkdUnhNVwM+k4hnJgU/bthw6syu9dMJTvwLZbGICYfbtgX4jqQfK1Ge Q2VlxffwQAmOyZj5KVP7b0mQQ0NmFlobCwnIOk29qTJ70kcwzbAkMomlLSnXhyqaySK1 0MXEGiWFLply1h6O2hMOM5lFzLYN1S0ZljX+nEB/cDl+MZNaFXK18/1TcVv7Lcc+s9ul s5lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bPw0i8dc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 18si422916edv.191.2020.06.29.14.10.24; Mon, 29 Jun 2020 14:10:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=bPw0i8dc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731104AbgF2VIj (ORCPT + 99 others); Mon, 29 Jun 2020 17:08:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:45422 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730331AbgF2TAT (ORCPT ); Mon, 29 Jun 2020 15:00:19 -0400 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 076CD25521; Mon, 29 Jun 2020 15:54:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593446083; bh=+DMUUgr9D6uvdJVqahzq9YkaVV0oxf2qaoM9WEMrPfs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bPw0i8dcvYXQ39UyPpLAT0zJoJ2IMvHOB+t02BlEJeUX+PBGVkIqSuxAm5W1rWYcQ iXBCFyffabhYHpRFSJIDb2L38qMvXGXs4QgUa4gh9fW3kX10SVkZgehoXf29xS9I8f NumlDGrzxhwaG4D5N2YO0CNDU4STMEPd4ipL3D7s= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin Wilck , Bart Van Assche , "Martin K . Petersen" , Guenter Roeck , Greg Kroah-Hartman Subject: [PATCH 4.4 078/135] scsi: scsi_devinfo: handle non-terminated strings Date: Mon, 29 Jun 2020 11:52:12 -0400 Message-Id: <20200629155309.2495516-79-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629155309.2495516-1-sashal@kernel.org> References: <20200629155309.2495516-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.229-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.4.229-rc1 X-KernelTest-Deadline: 2020-07-01T15:53+00:00 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: Martin Wilck commit ba69ead9e9e9bb3cec5faf03526c36764ac8942a upstream. devinfo->vendor and devinfo->model aren't necessarily zero-terminated. Fixes: b8018b973c7c "scsi_devinfo: fixup string compare" Signed-off-by: Martin Wilck Reviewed-by: Bart Van Assche Signed-off-by: Martin K. Petersen Cc: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/scsi_devinfo.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c index 4055cb7c212b9..3a9b6b61607e6 100644 --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c @@ -443,7 +443,8 @@ static struct scsi_dev_info_list *scsi_dev_info_list_find(const char *vendor, /* * vendor strings must be an exact match */ - if (vmax != strlen(devinfo->vendor) || + if (vmax != strnlen(devinfo->vendor, + sizeof(devinfo->vendor)) || memcmp(devinfo->vendor, vskip, vmax)) continue; @@ -451,7 +452,7 @@ static struct scsi_dev_info_list *scsi_dev_info_list_find(const char *vendor, * @model specifies the full string, and * must be larger or equal to devinfo->model */ - mlen = strlen(devinfo->model); + mlen = strnlen(devinfo->model, sizeof(devinfo->model)); if (mmax < mlen || memcmp(devinfo->model, mskip, mlen)) continue; return devinfo; -- 2.25.1