The SigmaDSP firmware loader currently does not perform enough boundary size checks when processing the firmware. As a result it is possible that a malformed firmware can cause an out of bounds memory access. This patch adds checks which ensure that both the action header and the payload are completely inside the firmware data boundaries before processing them.
Unified · Split
| @@ -14,13 +14,34 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/module.h> |
| 15 | 15 | #include <linux/sigma.h> |
| 16 | 16 | |
| 17 | −/* Return: 0==OK, <0==error, =1 ==no more actions */ | |
| 17 | +static size_t sigma_action_size(struct sigma_action *sa) | |
| 18 | +{ | |
| 19 | + size_t payload = 0; | |
| 20 | + | |
| 21 | + switch (sa->instr) { | |
| 22 | + case SIGMA_ACTION_WRITEXBYTES: | |
| 23 | + case SIGMA_ACTION_WRITESINGLE: | |
| 24 | + case SIGMA_ACTION_WRITESAFELOAD: | |
| 25 | + payload = sigma_action_len(sa); | |
| 26 | + break; | |
| 27 | + default: | |
| 28 | + break; | |
| 29 | + } | |
| 30 | + | |
| 31 | + payload = ALIGN(payload, 2); | |
| 32 | + | |
| 33 | + return payload + sizeof(struct sigma_action); | |
| 34 | +} | |
| 35 | + | |
| 36 | +/* | |
| 37 | + * Returns a negative error value in case of an error, 0 if processing of | |
| 38 | + * the firmware should be stopped after this action, 1 otherwise. | |
| 39 | + */ | |
| 18 | 40 | static int |
| 19 | −process_sigma_action(struct i2c_client *client, struct sigma_firmware *ssfw) | |
| 41 | +process_sigma_action(struct i2c_client *client, struct sigma_action *sa) | |
| 20 | 42 | { |
| 21 | − struct sigma_action *sa = (void *)(ssfw->fw->data + ssfw->pos); | |
| 22 | 43 | size_t len = sigma_action_len(sa); |
| 23 | − int ret = 0; | |
| 44 | + int ret; | |
| 24 | 45 | |
| 25 | 46 | pr_debug("%s: instr:%i addr:%#x len:%zu\n", __func__, |
| 26 | 47 | sa->instr, sa->addr, len); |
| @@ -29,44 +50,50 @@ process_sigma_action(struct i2c_client *client, struct sigma_firmware *ssfw) · 2 unmodified lines | ||
| 29 | 50 | case SIGMA_ACTION_WRITEXBYTES: |
| 30 | 51 | case SIGMA_ACTION_WRITESINGLE: |
| 31 | 52 | case SIGMA_ACTION_WRITESAFELOAD: |
| 32 | − if (ssfw->fw->size < ssfw->pos + len) | |
| 33 | − return -EINVAL; | |
| 34 | 53 | ret = i2c_master_send(client, (void *)&sa->addr, len); |
| 35 | 54 | if (ret < 0) |
| 36 | 55 | return -EINVAL; |
| 37 | 56 | break; |
| 38 | − | |
| 39 | 57 | case SIGMA_ACTION_DELAY: |
| 40 | − ret = 0; | |
| 41 | 58 | udelay(len); |
| 42 | 59 | len = 0; |
| 43 | 60 | break; |
| 44 | − | |
| 45 | 61 | case SIGMA_ACTION_END: |
| 46 | − return 1; | |
| 47 | − | |
| 62 | + return 0; | |
| 48 | 63 | default: |
| 49 | 64 | return -EINVAL; |
| 50 | 65 | } |
| 51 | 66 | |
| 52 | − /* when arrive here ret=0 or sent data */ | |
| 53 | − ssfw->pos += sigma_action_size(sa, len); | |
| 54 | − return ssfw->pos == ssfw->fw->size; | |
| 67 | + return 1; | |
| 55 | 68 | } |
| 56 | 69 | |
| 57 | 70 | static int |
| 58 | 71 | process_sigma_actions(struct i2c_client *client, struct sigma_firmware *ssfw) |
| 59 | 72 | { |
| 60 | − pr_debug("%s: processing %p\n", __func__, ssfw); | |
| 73 | + struct sigma_action *sa; | |
| 74 | + size_t size; | |
| 75 | + int ret; | |
| 76 | + | |
| 77 | + while (ssfw->pos + sizeof(*sa) <= ssfw->fw->size) { | |
| 78 | + sa = (struct sigma_action *)(ssfw->fw->data + ssfw->pos); | |
| 79 | + | |
| 80 | + size = sigma_action_size(sa); | |
| 81 | + ssfw->pos += size; | |
| 82 | + if (ssfw->pos > ssfw->fw->size || size == 0) | |
| 83 | + break; | |
| 84 | + | |
| 85 | + ret = process_sigma_action(client, sa); | |
| 61 | 86 | |
| 62 | − while (1) { | |
| 63 | − int ret = process_sigma_action(client, ssfw); | |
| 64 | 87 | pr_debug("%s: action returned %i\n", __func__, ret); |
| 65 | − if (ret == 1) | |
| 66 | − return 0; | |
| 67 | − else if (ret) | |
| 88 | + | |
| 89 | + if (ret <= 0) | |
| 68 | 90 | return ret; |
| 69 | 91 | } |
| 92 | + | |
| 93 | + if (ssfw->pos != ssfw->fw->size) | |
| 94 | + return -EINVAL; | |
| 95 | + | |
| 96 | + return 0; | |
| 70 | 97 | } |
| 71 | 98 | |
| 72 | 99 | int process_sigma_firmware(struct i2c_client *client, const char *name) |
| @@ -89,7 +116,14 @@ int process_sigma_firmware(struct i2c_client *client, const char *name) · 16 unmodified lines | ||
| 89 | 116 | |
| 90 | 117 | /* then verify the header */ |
| 91 | 118 | ret = -EINVAL; |
| 92 | − if (fw->size < sizeof(*ssfw_head)) | |
| 119 | + | |
| 120 | + /* | |
| 121 | + * Reject too small or unreasonable large files. The upper limit has been | |
| 122 | + * chosen a bit arbitrarily, but it should be enough for all practical | |
| 123 | + * purposes and having the limit makes it easier to avoid integer | |
| 124 | + * overflows later in the loading process. | |
| 125 | + */ | |
| 126 | + if (fw->size < sizeof(*ssfw_head) || fw->size >= 0x4000000) | |
| 93 | 127 | goto done; |
| 94 | 128 | |
| 95 | 129 | ssfw_head = (void *)fw->data; |
| @@ -50,11 +50,6 @@ static inline u32 sigma_action_len(struct sigma_action *sa) · 49 unmodified lines | ||
| 50 | 50 | return (sa->len_hi << 16) | sa->len; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | −static inline size_t sigma_action_size(struct sigma_action *sa, u32 payload_len) | |
| 54 | −{ | |
| 55 | − return sizeof(*sa) + payload_len + (payload_len % 2); | |
| 56 | −} | |
| 57 | − | |
| 58 | 53 | extern int process_sigma_firmware(struct i2c_client *client, const char *name); |
| 59 | 54 | |
| 60 | 55 | #endif |