diff options
| author | Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> | 2014-07-26 17:26:51 -0400 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-01-30 00:32:13 -0500 |
| commit | 5db431285d832156852d6f0013089b5d2305a28d (patch) | |
| tree | c317ad2e15aeeba0e64b52ecbeddf8f2fcf541b0 | |
| parent | 8ac6e995ac17f33a5cc6796c5069488eb9f4abd7 (diff) | |
powerpc/qe: Use strlcpy()
Replace strcpy and strncpy with strlcpy to avoid strings that are too
big, or lack null termination.
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
[scottwood@freescale.com: cleaned up commit message]
Signed-off-by: Scott Wood <scottwood@freescale.com>
| -rw-r--r-- | arch/powerpc/sysdev/qe_lib/qe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c index 1f29cee8da7b..c2518cdb7ddb 100644 --- a/arch/powerpc/sysdev/qe_lib/qe.c +++ b/arch/powerpc/sysdev/qe_lib/qe.c | |||
| @@ -497,7 +497,7 @@ int qe_upload_firmware(const struct qe_firmware *firmware) | |||
| 497 | * saved microcode information and put in the new. | 497 | * saved microcode information and put in the new. |
| 498 | */ | 498 | */ |
| 499 | memset(&qe_firmware_info, 0, sizeof(qe_firmware_info)); | 499 | memset(&qe_firmware_info, 0, sizeof(qe_firmware_info)); |
| 500 | strcpy(qe_firmware_info.id, firmware->id); | 500 | strlcpy(qe_firmware_info.id, firmware->id, sizeof(qe_firmware_info.id)); |
| 501 | qe_firmware_info.extended_modes = firmware->extended_modes; | 501 | qe_firmware_info.extended_modes = firmware->extended_modes; |
| 502 | memcpy(qe_firmware_info.vtraps, firmware->vtraps, | 502 | memcpy(qe_firmware_info.vtraps, firmware->vtraps, |
| 503 | sizeof(firmware->vtraps)); | 503 | sizeof(firmware->vtraps)); |
| @@ -583,8 +583,8 @@ struct qe_firmware_info *qe_get_firmware_info(void) | |||
| 583 | /* Copy the data into qe_firmware_info*/ | 583 | /* Copy the data into qe_firmware_info*/ |
| 584 | sprop = of_get_property(fw, "id", NULL); | 584 | sprop = of_get_property(fw, "id", NULL); |
| 585 | if (sprop) | 585 | if (sprop) |
| 586 | strncpy(qe_firmware_info.id, sprop, | 586 | strlcpy(qe_firmware_info.id, sprop, |
| 587 | sizeof(qe_firmware_info.id) - 1); | 587 | sizeof(qe_firmware_info.id)); |
| 588 | 588 | ||
| 589 | prop = of_find_property(fw, "extended-modes", NULL); | 589 | prop = of_find_property(fw, "extended-modes", NULL); |
| 590 | if (prop && (prop->length == sizeof(u64))) { | 590 | if (prop && (prop->length == sizeof(u64))) { |
