diff options
| author | Michael Tokarev <mjt@tls.msk.ru> | 2024-03-31 13:07:34 +0300 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-04-24 15:46:00 -0700 |
| commit | 04f6fb897a5aeb3e356a7b889869c9962f9c16c7 (patch) | |
| tree | 16428da906b97123bd2bb87f154cbd963d947951 | |
| parent | 1f2355f53c752297789d431575c4ba975219599c (diff) | |
| download | qemu-04f6fb897a5aeb3e356a7b889869c9962f9c16c7.zip qemu-04f6fb897a5aeb3e356a7b889869c9962f9c16c7.tar.gz qemu-04f6fb897a5aeb3e356a7b889869c9962f9c16c7.tar.bz2 | |
linux-user: do_setsockopt: fix SOL_ALG.ALG_SET_KEY
This setsockopt accepts zero-lengh optlen (current qemu implementation
does not allow this). Also, there's no need to make a copy of the key,
it is enough to use lock_user() (which accepts zero length already).
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2197
Fixes: f31dddd2fc "linux-user: Add support for setsockopt() option SOL_ALG"
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Message-Id: <20240331100737.2724186-2-mjt@tls.msk.ru>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | linux-user/syscall.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 3df2b94..59fb3e91 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2277,18 +2277,13 @@ static abi_long do_setsockopt(int sockfd, int level, int optname, switch (optname) { case ALG_SET_KEY: { - char *alg_key = g_malloc(optlen); - + char *alg_key = lock_user(VERIFY_READ, optval_addr, optlen, 1); if (!alg_key) { - return -TARGET_ENOMEM; - } - if (copy_from_user(alg_key, optval_addr, optlen)) { - g_free(alg_key); return -TARGET_EFAULT; } ret = get_errno(setsockopt(sockfd, level, optname, alg_key, optlen)); - g_free(alg_key); + unlock_user(alg_key, optval_addr, optlen); break; } case ALG_SET_AEAD_AUTHSIZE: |