]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: be2iscsi: Add length check when parsing nlattrs
authorLin Ma <linma@zju.edu.cn>
Sun, 23 Jul 2023 07:59:38 +0000 (15:59 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Sep 2023 08:46:58 +0000 (10:46 +0200)
[ 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>
drivers/scsi/be2iscsi/be_iscsi.c

index 43a80ce5ce6a9fc9955395f4ed3b556324516626..0e95bccac32e34966c6f155a21576e1b3458497a 100644 (file)
@@ -442,6 +442,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)