From nobody Mon Feb 9 19:06:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1620398637; cv=none; d=zohomail.com; s=zohoarc; b=LcRfn0VSCcB9AduqFoqchkxF+Ruvg+EZR5nbocT8Ybv3HhfwRAyP2F9RjtKgB3EMsNdKaeibv/d9snECAmKS/maQYt6tayDmnP9nyF+UeDmU/oc+KxV6oXiaPDcYveYd2iTkDcvTc7kyqOn63RWA1ACDy+iswwBlHq2t1AWtFks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620398637; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=9UwtNiSXhDRvxxEBq2bA0+BsvH/APBPHI+6JmS4Uqh4=; b=CFJK8n1wT5MjOBka/gtFUUkLtU3Q6sbDEynhNRBTy1G+6MFRElqTRzoqK4xGHTsfHivHK9OMK+BloX4ctuM59IVl8tFd9fiMpAof7Mae9+X3wSnzBsaaksc96VDJ9FT/NOTX2eV2bqJncsenEHuwJ81NLld+TEJLmo3BaDr8WO0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1620398637242862.5988956299205; Fri, 7 May 2021 07:43:57 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-5-8mP09EuROky4H3qXmW1SlA-1; Fri, 07 May 2021 10:43:52 -0400 Received: by mail-wm1-f71.google.com with SMTP id g199-20020a1c9dd00000b02901355dd71edaso3986527wme.7 for ; Fri, 07 May 2021 07:43:52 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (astrasbourg-652-1-219-60.w90-40.abo.wanadoo.fr. [90.40.114.60]) by smtp.gmail.com with ESMTPSA id d3sm8221624wri.75.2021.05.07.07.43.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 May 2021 07:43:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620398634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9UwtNiSXhDRvxxEBq2bA0+BsvH/APBPHI+6JmS4Uqh4=; b=ba0pIw39FsH2AzeV8xuN5DnIEiSYjJyNvPT2mgy/9e+WQYps0UUhjxUReMAFiXuqikIJtg br/WpRct94ZKK9GXQVZM7VzOfpU4JR5SpTtkYNhtdOulbCufUAhvx7TB3vgiJlyH9zKx7Y UqrfEzVM63odubiq13gR4zmZa2OXkjs= X-MC-Unique: 8mP09EuROky4H3qXmW1SlA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9UwtNiSXhDRvxxEBq2bA0+BsvH/APBPHI+6JmS4Uqh4=; b=Kjh3ezwFiKEC7wiWJbnEA85CA+wl6vitIYTrN3KIJZMWCpsOGUL6CArM4EEPYVY0U4 R2DiHfla4v1nDw5Pre0pHJzvf+oVs0dY9QPG7Khm41F54wiJgDqWzehcFa9TbHEhiaLB ACEbYLtncw2rutc59oeR2nQN+ZOtUyRhqs3mlc0U6R7tjkBQebUbj3IC/goTjieYMY5M cs/HK6VtTqZsFttUFxDDd7XhegYy3ScRSR4N3O8oHbmQMOIONTRWEN6i+7c71Grn6xyT lG1alvVd66DxX1jJBiNmFE5/AbwoYyAYoIg6Qr6ByxZZOttj9Yasa+BqZjuF8dgkLknP igOg== X-Gm-Message-State: AOAM531GucPNb/2NlBFv3+B73eq2feiA1msRusQwccJ0Q3j8XONP9LFR zpbRWfRS2TNI7N8OPBSM+Fi3dPvOzDgIatAf7AcqUl9sZBP3DKSXjrU112R2FhVxSm6c9GwE4hs QYIGxJMGzoMaUlg== X-Received: by 2002:a5d:4acc:: with SMTP id y12mr12640285wrs.233.1620398631054; Fri, 07 May 2021 07:43:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzpO9HD46hd1zWh+qoigRuizkz+et7j2kyahnyJH43scB9tmRKhQTHHgYM62Qg0Bn5FVKcPCg== X-Received: by 2002:a5d:4acc:: with SMTP id y12mr12640261wrs.233.1620398630869; Fri, 07 May 2021 07:43:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Paolo Bonzini , qemu-ppc@nongnu.org, Peter Maydell , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 07/17] linux-user: Replace alloca() by g_try_malloc() in various socket syscall Date: Fri, 7 May 2021 16:43:05 +0200 Message-Id: <20210507144315.1994337-8-philmd@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210507144315.1994337-1-philmd@redhat.com> References: <20210507144315.1994337-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The ALLOCA(3) man-page mentions its "use is discouraged". Use autofree heap allocation instead (returning ENOMEM on failure). Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- linux-user/syscall.c | 50 +++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index a263aea85ff..7c5c821f48d 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -3307,14 +3307,17 @@ static abi_long do_socket(int domain, int type, int= protocol) static abi_long do_bind(int sockfd, abi_ulong target_addr, socklen_t addrlen) { - void *addr; + g_autofree void *addr =3D NULL; abi_long ret; =20 if ((int)addrlen < 0) { return -TARGET_EINVAL; } =20 - addr =3D alloca(addrlen+1); + addr =3D g_try_malloc(addrlen + 1); + if (!addr) { + return -TARGET_ENOMEM; + } =20 ret =3D target_to_host_sockaddr(sockfd, addr, target_addr, addrlen); if (ret) @@ -3327,14 +3330,17 @@ static abi_long do_bind(int sockfd, abi_ulong targe= t_addr, static abi_long do_connect(int sockfd, abi_ulong target_addr, socklen_t addrlen) { - void *addr; + g_autofree void *addr =3D NULL; abi_long ret; =20 if ((int)addrlen < 0) { return -TARGET_EINVAL; } =20 - addr =3D alloca(addrlen+1); + addr =3D g_try_malloc(addrlen + 1); + if (!addr) { + return -TARGET_ENOMEM; + } =20 ret =3D target_to_host_sockaddr(sockfd, addr, target_addr, addrlen); if (ret) @@ -3519,7 +3525,7 @@ static abi_long do_accept4(int fd, abi_ulong target_a= ddr, abi_ulong target_addrlen_addr, int flags) { socklen_t addrlen, ret_addrlen; - void *addr; + g_autofree void *addr =3D NULL; abi_long ret; int host_flags; =20 @@ -3541,7 +3547,10 @@ static abi_long do_accept4(int fd, abi_ulong target_= addr, return -TARGET_EFAULT; } =20 - addr =3D alloca(addrlen); + addr =3D g_try_malloc(addrlen); + if (!addr) { + return -TARGET_ENOMEM; + } =20 ret_addrlen =3D addrlen; ret =3D get_errno(safe_accept4(fd, addr, &ret_addrlen, host_flags)); @@ -3559,7 +3568,7 @@ static abi_long do_getpeername(int fd, abi_ulong targ= et_addr, abi_ulong target_addrlen_addr) { socklen_t addrlen, ret_addrlen; - void *addr; + g_autofree void *addr =3D NULL; abi_long ret; =20 if (get_user_u32(addrlen, target_addrlen_addr)) @@ -3573,7 +3582,10 @@ static abi_long do_getpeername(int fd, abi_ulong tar= get_addr, return -TARGET_EFAULT; } =20 - addr =3D alloca(addrlen); + addr =3D g_try_malloc(addrlen); + if (!addr) { + return -TARGET_ENOMEM; + } =20 ret_addrlen =3D addrlen; ret =3D get_errno(getpeername(fd, addr, &ret_addrlen)); @@ -3591,7 +3603,7 @@ static abi_long do_getsockname(int fd, abi_ulong targ= et_addr, abi_ulong target_addrlen_addr) { socklen_t addrlen, ret_addrlen; - void *addr; + g_autofree void *addr =3D NULL; abi_long ret; =20 if (get_user_u32(addrlen, target_addrlen_addr)) @@ -3605,7 +3617,10 @@ static abi_long do_getsockname(int fd, abi_ulong tar= get_addr, return -TARGET_EFAULT; } =20 - addr =3D alloca(addrlen); + addr =3D g_try_malloc(addrlen); + if (!addr) { + return -TARGET_ENOMEM; + } =20 ret_addrlen =3D addrlen; ret =3D get_errno(getsockname(fd, addr, &ret_addrlen)); @@ -3640,7 +3655,6 @@ static abi_long do_socketpair(int domain, int type, i= nt protocol, static abi_long do_sendto(int fd, abi_ulong msg, size_t len, int flags, abi_ulong target_addr, socklen_t addrlen) { - void *addr; void *host_msg; void *copy_msg =3D NULL; abi_long ret; @@ -3662,7 +3676,11 @@ static abi_long do_sendto(int fd, abi_ulong msg, siz= e_t len, int flags, } } if (target_addr) { - addr =3D alloca(addrlen+1); + g_autofree void *addr =3D g_try_malloc(addrlen + 1); + + if (!addr) { + return -TARGET_ENOMEM; + } ret =3D target_to_host_sockaddr(fd, addr, target_addr, addrlen); if (ret) { goto fail; @@ -3686,7 +3704,7 @@ static abi_long do_recvfrom(int fd, abi_ulong msg, si= ze_t len, int flags, abi_ulong target_addrlen) { socklen_t addrlen, ret_addrlen; - void *addr; + g_autofree void *addr =3D NULL; void *host_msg; abi_long ret; =20 @@ -3707,12 +3725,14 @@ static abi_long do_recvfrom(int fd, abi_ulong msg, = size_t len, int flags, ret =3D -TARGET_EINVAL; goto fail; } - addr =3D alloca(addrlen); + addr =3D g_try_malloc(addrlen); + if (!addr) { + return -TARGET_ENOMEM; + } ret_addrlen =3D addrlen; ret =3D get_errno(safe_recvfrom(fd, host_msg, len, flags, addr, &ret_addrlen)); } else { - addr =3D NULL; /* To keep compiler quiet. */ addrlen =3D 0; /* To keep compiler quiet. */ ret =3D get_errno(safe_recvfrom(fd, host_msg, len, flags, NULL, 0)= ); } --=20 2.26.3