From nobody Mon Feb 9 14:38:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1620398630; cv=none; d=zohomail.com; s=zohoarc; b=DAe7Pib0/oSHBVL9/lakX5JrgVhCCLKhJ0mrjSplpMzhSQtMXd8MR/YQ6KWglyNwZDqzsCCuPyqmhnM5Ujrw4XiWHhepnzIWkd1UEU7eZRnhH37L3uf0u++jDDl1xO0BYG/EbZMo2tcJejs0UVI/JItkwMtUgd90l8yf1Stnp/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620398630; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=2L5mr2b7hhw5EkGSTWl47QqXXqBmVyFmMYU/e54ubTE=; b=UnC/yqdsUcc5yoATjuNEtF6hFsPqrFVs3FvCe3mcZ07J9jPg6j7ovaOq1FCfLstt4KLuJCJYXZueFGk1QN7g1jxJJa3sZXtLw5APwoNoh1bdsoSnAUktJrk+5vt2lEYxkBKFn+Mr0FW8NeXAe+WPD0xRzSrYjI+nRaQgI668Fxw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1620398630359591.9777975742894; Fri, 7 May 2021 07:43:50 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-62-_xnPC-QoN6ys2nerwPXlig-1; Fri, 07 May 2021 10:43:47 -0400 Received: by mail-wr1-f71.google.com with SMTP id j33-20020adf91240000b029010e4009d2ffso1235041wrj.0 for ; Fri, 07 May 2021 07:43:47 -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 f4sm9261707wrz.33.2021.05.07.07.43.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 May 2021 07:43:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620398629; 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=2L5mr2b7hhw5EkGSTWl47QqXXqBmVyFmMYU/e54ubTE=; b=SorAX5dc2LcT4RbwUVVxlDFS3JFsyE7ZGfeLCAt6dgaG16f21fb8ociBNSiMy1ws2ImotF uFiXdzPZXVwcEVkVOzF7GeuJWsqxuqTh9Usx7hcBLZSPu65iXNmunNSoAoH1KyTCEy0S6v 3sCpu08MnZkh8cwH4ZCZkBGgstgSZ8U= X-MC-Unique: _xnPC-QoN6ys2nerwPXlig-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=2L5mr2b7hhw5EkGSTWl47QqXXqBmVyFmMYU/e54ubTE=; b=El1vBOZ5EsOkehaLSt6FZs1I5Izwi21LH6uxmUOXtnNEZ7FlhZG7UFL/kL3MMuTLlu Jl9frGHETpuNogujffVXgwERw10GhJxDWGk3HxE51QH9B8Qo4tI2PYqif4awMDAa2aYj HuyNNCRQxxcUPeFkaYki48JaOEMhsWVcs9gLLRLxGI3g6NFPz89lXSu8XDd8E7X8nuzB 6L3jg2ba/s1eZOssDBelw6LsiOzPpurcVHR3qCC6hWVWzQoSGDHNuI4zpHs7NFZsUkAJ YBPRtUy4+9YLu3XUTQsZGKCoYRhC6OUCiLy8NeWyDLRJKQ5vRGhYMxQBBzR2bxRjH8Ni vN2g== X-Gm-Message-State: AOAM531/EmII9qJ+C7Bh+6TTCWp4YtiiB/l3fGXs2d8Vplpx4lngCYWZ 3brK5R/YIv/fmgRlRnqS9SpjvAgYN3JkfE68ptV7hDpHmKYdMkeMc4ED6dZYWUO+oNSDKAm93pl 7+ulAy2kLytQc4Q== X-Received: by 2002:a5d:6682:: with SMTP id l2mr12867711wru.15.1620398626337; Fri, 07 May 2021 07:43:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9DMJA8+x/NYI0yJJsbEcLCTwgBtgsQmZh7JNyu0BIiNXSApGIllKxUmvSifBrFhmtnMgQDw== X-Received: by 2002:a5d:6682:: with SMTP id l2mr12867692wru.15.1620398626166; Fri, 07 May 2021 07:43:46 -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 06/17] linux-user: Replace alloca() by g_try_malloc() in setsockopt() syscall Date: Fri, 7 May 2021 16:43:04 +0200 Message-Id: <20210507144315.1994337-7-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 | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 0bf4273fc7a..a263aea85ff 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2191,7 +2191,6 @@ static abi_long do_setsockopt(int sockfd, int level, = int optname, { abi_long ret; int val; - struct ip_mreqn *ip_mreq; struct ip_mreq_source *ip_mreq_source; =20 switch(level) { @@ -2235,15 +2234,21 @@ static abi_long do_setsockopt(int sockfd, int level= , int optname, break; case IP_ADD_MEMBERSHIP: case IP_DROP_MEMBERSHIP: + { + g_autofree struct ip_mreqn *ip_mreq =3D NULL; + if (optlen < sizeof (struct target_ip_mreq) || optlen > sizeof (struct target_ip_mreqn)) return -TARGET_EINVAL; =20 - ip_mreq =3D (struct ip_mreqn *) alloca(optlen); + ip_mreq =3D g_try_malloc(optlen); + if (!ip_mreq) { + return -TARGET_ENOMEM; + } target_to_host_ip_mreq(ip_mreq, optval_addr, optlen); ret =3D get_errno(setsockopt(sockfd, level, optname, ip_mreq, = optlen)); break; - + } case IP_BLOCK_SOURCE: case IP_UNBLOCK_SOURCE: case IP_ADD_SOURCE_MEMBERSHIP: @@ -2492,7 +2497,8 @@ set_timeout: } case TARGET_SO_BINDTODEVICE: { - char *dev_ifname, *addr_ifname; + char *dev_ifname; + g_autofree char *addr_ifname =3D NULL; =20 if (optlen > IFNAMSIZ - 1) { optlen =3D IFNAMSIZ - 1; @@ -2502,7 +2508,10 @@ set_timeout: return -TARGET_EFAULT; } optname =3D SO_BINDTODEVICE; - addr_ifname =3D alloca(IFNAMSIZ); + addr_ifname =3D g_try_malloc(IFNAMSIZ); + if (!addr_ifname) { + return -TARGET_ENOMEM; + } memcpy(addr_ifname, dev_ifname, optlen); addr_ifname[optlen] =3D 0; ret =3D get_errno(setsockopt(sockfd, SOL_SOCKET, optname, --=20 2.26.3