]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: qla4xxx: Add length check when parsing nlattrs
authorLin Ma <linma@zju.edu.cn>
Sun, 23 Jul 2023 08:00:53 +0000 (16:00 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Sep 2023 08:46:58 +0000 (10:46 +0200)
[ Upstream commit 47cd3770e31df942e2bb925a9a855c79ed0662eb ]

There are three places that qla4xxx parses nlattrs:

 - qla4xxx_set_chap_entry()

 - qla4xxx_iface_set_param()

 - qla4xxx_sysfs_ddb_set_param()

and each of them directly converts the nlattr to specific pointer of
structure without length checking. This could be dangerous as those
attributes are not validated and a malformed nlattr (e.g., length 0) could
result in an OOB read that leaks heap dirty data.

Add the nla_len check before accessing the nlattr data and return EINVAL if
the length check fails.

Fixes: 26ffd7b45fe9 ("[SCSI] qla4xxx: Add support to set CHAP entries")
Fixes: 1e9e2be3ee03 ("[SCSI] qla4xxx: Add flash node mgmt support")
Fixes: 00c31889f751 ("[SCSI] qla4xxx: fix data alignment and use nl helpers")
Signed-off-by: Lin Ma <linma@zju.edu.cn>
Link: https://lore.kernel.org/r/20230723080053.3714534-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/qla4xxx/ql4_os.c

index 62022a66e9ee27a3721b4fc1da2b49ce81dc3634..d6e9717cb0fb524bb8bbd218a15a39d2faa5d6af 100644 (file)
@@ -942,6 +942,11 @@ static int qla4xxx_set_chap_entry(struct Scsi_Host *shost, void *data, int len)
        memset(&chap_rec, 0, sizeof(chap_rec));
 
        nla_for_each_attr(attr, data, len, rem) {
+               if (nla_len(attr) < sizeof(*param_info)) {
+                       rc = -EINVAL;
+                       goto exit_set_chap;
+               }
+
                param_info = nla_data(attr);
 
                switch (param_info->param) {
@@ -2727,6 +2732,11 @@ qla4xxx_iface_set_param(struct Scsi_Host *shost, void *data, uint32_t len)
        }
 
        nla_for_each_attr(attr, data, len, rem) {
+               if (nla_len(attr) < sizeof(*iface_param)) {
+                       rval = -EINVAL;
+                       goto exit_init_fw_cb;
+               }
+
                iface_param = nla_data(attr);
 
                if (iface_param->param_type == ISCSI_NET_PARAM) {
@@ -8102,6 +8112,11 @@ qla4xxx_sysfs_ddb_set_param(struct iscsi_bus_flash_session *fnode_sess,
 
        memset((void *)&chap_tbl, 0, sizeof(chap_tbl));
        nla_for_each_attr(attr, data, len, rem) {
+               if (nla_len(attr) < sizeof(*fnode_param)) {
+                       rc = -EINVAL;
+                       goto exit_set_param;
+               }
+
                fnode_param = nla_data(attr);
 
                switch (fnode_param->param) {