diff options
| author | Pali Rohár | 2021-08-03 16:28:38 +0200 |
|---|---|---|
| committer | Tom Rini | 2021-09-03 14:32:40 -0400 |
| commit | 1e7478461bb4e8842f1ca8e5ffb5a441041b0753 (patch) | |
| tree | 2760a8ed96bc8cbd1c9325c51d39eb659680a542 /common/xyzModem.c | |
| parent | 00179319714fd2076cf81f49de357ee699672f31 (diff) | |
xyz-modem: Fix crash after cancelling transfer
Variable xyz.len is set to -1 on error. At the end xyzModem_stream_read()
function calls memcpy() with length from variable xyz.len. If this variable
is set to -1 then value passed to memcpy is casted to unsigned value, which
means to copy whole address space. Which then cause U-Boot crash. E.g. on
arm64 it cause CPU crash: "Synchronous Abort" handler, esr 0x96000006
Fix this issue by checking that value stored in xyz.len is valid prior
trying to use it.
Signed-off-by: Pali Rohár <pali@kernel.org>
Acked-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Diffstat (limited to 'common/xyzModem.c')
| -rw-r--r-- | common/xyzModem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/xyzModem.c b/common/xyzModem.c index fc3459ebbaf..b1b72aae0ba 100644 --- a/common/xyzModem.c +++ b/common/xyzModem.c @@ -494,7 +494,7 @@ xyzModem_stream_read (char *buf, int size, int *err) total = 0; stat = xyzModem_cancel; /* Try and get 'size' bytes into the buffer */ - while (!xyz.at_eof && (size > 0)) + while (!xyz.at_eof && xyz.len >= 0 && (size > 0)) { if (xyz.len == 0) { @@ -587,7 +587,7 @@ xyzModem_stream_read (char *buf, int size, int *err) } } /* Don't "read" data from the EOF protocol package */ - if (!xyz.at_eof) + if (!xyz.at_eof && xyz.len > 0) { len = xyz.len; if (size < len) |