summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLin Ma <linma@zju.edu.cn>2023-07-23 15:59:38 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-09-23 10:48:07 +0200
commit94ec7f346006ba068f24c5140113dad7551a160e (patch)
treef5391c54aa9bb1a263f20319ee85ae487f94a954
parentdded34dd7dffc3e7f4ec000c9e110982ac20a5c1 (diff)
downloadlinux-stable-94ec7f346006ba068f24c5140113dad7551a160e.tar.gz
linux-stable-94ec7f346006ba068f24c5140113dad7551a160e.tar.bz2
linux-stable-94ec7f346006ba068f24c5140113dad7551a160e.zip
scsi: be2iscsi: Add length check when parsing nlattrs
[ Upstream commit ee0268f230f66cb472df3424f380ea668da2749a ] beiscsi_iface_set_param() parses nlattr with nla_for_each_attr and assumes every attributes can be viewed as struct iscsi_iface_param_info. This is not true because there is no any nla_policy to validate the attributes passed from the upper function iscsi_set_iface_params(). Add the nla_len check before accessing the nlattr data and return EINVAL if the length check fails. Fixes: 0e43895ec1f4 ("[SCSI] be2iscsi: adding functionality to change network settings using iscsiadm") Signed-off-by: Lin Ma <linma@zju.edu.cn> Link: https://lore.kernel.org/r/20230723075938.3713864-1-linma@zju.edu.cn Reviewed-by: Chris Leech <cleech@redhat.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/scsi/be2iscsi/be_iscsi.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c
index c8f0a2144b44..818a690771e0 100644
--- a/drivers/scsi/be2iscsi/be_iscsi.c
+++ b/drivers/scsi/be2iscsi/be_iscsi.c
@@ -445,6 +445,10 @@ int beiscsi_iface_set_param(struct Scsi_Host *shost,
}
nla_for_each_attr(attrib, data, dt_len, rm_len) {
+ /* ignore nla_type as it is never used */
+ if (nla_len(attrib) < sizeof(*iface_param))
+ return -EINVAL;
+
iface_param = nla_data(attrib);
if (iface_param->param_type != ISCSI_NET_PARAM)