From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C8C14C3D0; Mon, 14 Oct 2024 15:30:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728919828; cv=none; b=dPNaidY3TI8NP9ci6meOyrf2U4+amu1zTLtlQv0teLgpeXJ8VjEquGU7TjVJgHpVSjbfa66uvPvDQ6xxFdc7oIlhbDlZ1Yh4q0M2o//7Jr4lMBGd35GzX39bwapTeUdgv/HTI1mSGOyUxfZEVsnAnPFXWMwLQXTf86SJrdSkW+w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728919828; c=relaxed/simple; bh=rnLYbKiqbarBLeRvFBpN/OynZVqIQHipXbsiepvYADg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S0GQfc+fOz8KdMcbonnag3C0pFT0qYlhdErfhHPOMFxCDTNXjnSznHPTtruDZ1DckErA2Rnf0D8iHIyIeLlYkd2jAtGLGM3l062elOSGYg+/CA0aWKwLxPmtkXx4M8P5wimjWlFYK8kKB+ik1NmcPsgMBkJ4GcKngrUPOPmb0kk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gZX7rSfR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="gZX7rSfR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1328C4CEC3; Mon, 14 Oct 2024 15:30:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728919828; bh=rnLYbKiqbarBLeRvFBpN/OynZVqIQHipXbsiepvYADg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gZX7rSfRAQ5tt/fMvDE35/INeD63Qa4DwrKMLS7xtC8/S+StI8KQxIIe/TzqHJ8bO CG8zFvZt3SVlNLclzXTLyDHTxoGaP1Lmhe1dQgeVxfheW59wNKFTQwBQW0fMoi/Ib7 xVqTgqLtqm8TvcI//Og1JvrU4WD2mH14T9erA4SQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Riyan Dhiman , Dan Carpenter , Sasha Levin Subject: [PATCH 6.1 718/798] staging: vme_user: added bound check to geoid Date: Mon, 14 Oct 2024 16:21:12 +0200 Message-ID: <20241014141246.277222667@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241014141217.941104064@linuxfoundation.org> References: <20241014141217.941104064@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Riyan Dhiman [ Upstream commit a8a8b54350229f59c8ba6496fb5689a1632a59be ] The geoid is a module parameter that allows users to hardcode the slot number. A bound check for geoid was added in the probe function because only values between 0 and less than VME_MAX_SLOT are valid. Signed-off-by: Riyan Dhiman Reviewed-by: Dan Carpenter Link: https://lore.kernel.org/r/20240827125604.42771-2-riyandhiman14@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/vme_user/vme_fake.c | 6 ++++++ drivers/staging/vme_user/vme_tsi148.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/drivers/staging/vme_user/vme_fake.c b/drivers/staging/vme_user/vme_fake.c index 1ee432c223e2b..0c4d60aa00ab2 100644 --- a/drivers/staging/vme_user/vme_fake.c +++ b/drivers/staging/vme_user/vme_fake.c @@ -1071,6 +1071,12 @@ static int __init fake_init(void) struct vme_slave_resource *slave_image; struct vme_lm_resource *lm; + if (geoid < 0 || geoid >= VME_MAX_SLOTS) { + pr_err("VME geographical address must be between 0 and %d (exclusive), but got %d\n", + VME_MAX_SLOTS, geoid); + return -EINVAL; + } + /* We need a fake parent device */ vme_root = __root_device_register("vme", THIS_MODULE); if (IS_ERR(vme_root)) diff --git a/drivers/staging/vme_user/vme_tsi148.c b/drivers/staging/vme_user/vme_tsi148.c index 0171f46d1848f..0e649c8b259d1 100644 --- a/drivers/staging/vme_user/vme_tsi148.c +++ b/drivers/staging/vme_user/vme_tsi148.c @@ -2261,6 +2261,12 @@ static int tsi148_probe(struct pci_dev *pdev, const struct pci_device_id *id) struct vme_dma_resource *dma_ctrlr; struct vme_lm_resource *lm; + if (geoid < 0 || geoid >= VME_MAX_SLOTS) { + dev_err(&pdev->dev, "VME geographical address must be between 0 and %d (exclusive), but got %d\n", + VME_MAX_SLOTS, geoid); + return -EINVAL; + } + /* If we want to support more than one of each bridge, we need to * dynamically generate this so we get one per device */ -- 2.43.0