diff options
| author | Kees Cook <keescook@chromium.org> | 2020-07-24 14:36:24 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-25 12:06:33 +0200 |
| commit | 4fb60b158afd3ac9e0fe9975aa476213f5cc0a4d (patch) | |
| tree | d4a428a0821643d6d7f320d3a735dd9a978e139e /drivers/base/firmware_loader | |
| parent | 4505e2154e8f3896da5ba63818082746b3026c59 (diff) | |
| download | linux-4fb60b158afd3ac9e0fe9975aa476213f5cc0a4d.tar.gz linux-4fb60b158afd3ac9e0fe9975aa476213f5cc0a4d.tar.bz2 linux-4fb60b158afd3ac9e0fe9975aa476213f5cc0a4d.zip | |
firmware_loader: EFI firmware loader must handle pre-allocated buffer
The EFI platform firmware fallback would clobber any pre-allocated
buffers. Instead, correctly refuse to reallocate when too small (as
already done in the sysfs fallback), or perform allocation normally
when needed.
Fixes: e4c2c0ff00ec ("firmware: Add new platform fallback mechanism and firmware_request_platform()")
Cc: stable@vger.kernel.org
Acked-by: Scott Branden <scott.branden@broadcom.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20200724213640.389191-4-keescook@chromium.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/firmware_loader')
| -rw-r--r-- | drivers/base/firmware_loader/fallback_platform.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/base/firmware_loader/fallback_platform.c b/drivers/base/firmware_loader/fallback_platform.c index cdd2c9a9f38a..685edb7dd05a 100644 --- a/drivers/base/firmware_loader/fallback_platform.c +++ b/drivers/base/firmware_loader/fallback_platform.c @@ -25,7 +25,10 @@ int firmware_fallback_platform(struct fw_priv *fw_priv, u32 opt_flags) if (rc) return rc; /* rc == -ENOENT when the fw was not found */ - fw_priv->data = vmalloc(size); + if (fw_priv->data && size > fw_priv->allocated_size) + return -ENOMEM; + if (!fw_priv->data) + fw_priv->data = vmalloc(size); if (!fw_priv->data) return -ENOMEM; |