diff options
| author | Dominique Martinet <asmadeus@codewreck.org> | 2023-05-03 09:49:26 +0200 |
|---|---|---|
| committer | Eric Van Hensbergen <ericvh@kernel.org> | 2023-07-20 21:14:50 +0200 |
| commit | 13ade4ac5c28e8a014fa85278f5a4270b215f906 (patch) | |
| tree | 6c0ddb414fbb2d7b60e758555c721140e485f501 | |
| parent | 9p: fix ignored return value in v9fs_dir_release (diff) | |
| download | linux-13ade4ac5c28e8a014fa85278f5a4270b215f906.tar.xz linux-13ade4ac5c28e8a014fa85278f5a4270b215f906.zip | |
9p: virtio: fix unlikely null pointer deref in handle_rerror
handle_rerror can dereference the pages pointer, but it is not
necessarily set for small payloads.
In practice these should be filtered out by the size check, but
might as well double-check explicitly.
This fixes the following scan-build warnings:
net/9p/trans_virtio.c:401:24: warning: Dereference of null pointer [core.NullDereference]
memcpy_from_page(to, *pages++, offs, n);
^~~~~~~~
net/9p/trans_virtio.c:406:23: warning: Dereference of null pointer (loaded from variable 'pages') [core.NullDereference]
memcpy_from_page(to, *pages, offs, size);
^~~~~~
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Dominique Martinet <asmadeus@codewreck.org>
Signed-off-by: Eric Van Hensbergen <ericvh@kernel.org>
| -rw-r--r-- | net/9p/trans_virtio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c index 3c27ffb781e3..2c9495ccda6b 100644 --- a/net/9p/trans_virtio.c +++ b/net/9p/trans_virtio.c @@ -384,7 +384,7 @@ static void handle_rerror(struct p9_req_t *req, int in_hdr_len, void *to = req->rc.sdata + in_hdr_len; // Fits entirely into the static data? Nothing to do. - if (req->rc.size < in_hdr_len) + if (req->rc.size < in_hdr_len || !pages) return; // Really long error message? Tough, truncate the reply. Might get |