From patchwork Fri Sep 3 11:06:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12474229 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40E3DC433FE for ; Fri, 3 Sep 2021 11:28:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9DC21608FB for ; Fri, 3 Sep 2021 11:28:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9DC21608FB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:53136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mM7NG-0002te-Qo for qemu-devel@archiver.kernel.org; Fri, 03 Sep 2021 07:28:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM74D-0000DP-AY for qemu-devel@nongnu.org; Fri, 03 Sep 2021 07:09:05 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:30985) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM74A-0001nd-6V for qemu-devel@nongnu.org; Fri, 03 Sep 2021 07:09:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630667341; 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=6LOA6vxWsxNeyRV6PCApiN2cj9fcdeFYW29H3LS1FGk=; b=XOmt4Cha/bbgxq0+mjtpUiQwXx3Ax70QpMsFDB4Qv4OdQZEeDQBI8dbgPwyn8+bKM+IWoK bWO8I+1oeOQfol/pyv4XEg6C6AUPrMxZT6R2GMtTSys+wWJmBL0Y/Xkp5mTyhBJkjJsde+ FjXqtgEov9L6BJO0MkpKrjylYrn3Oys= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-552-PSt42AH5MrSgLmHo19z8uA-1; Fri, 03 Sep 2021 07:09:00 -0400 X-MC-Unique: PSt42AH5MrSgLmHo19z8uA-1 Received: by mail-wr1-f69.google.com with SMTP id h15-20020adff18f000000b001574654fbc2so1460632wro.10 for ; Fri, 03 Sep 2021 04:09:00 -0700 (PDT) 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=6LOA6vxWsxNeyRV6PCApiN2cj9fcdeFYW29H3LS1FGk=; b=tu6ESsX+6u2MAMeT7TESbmWA41tGV7McJc/5a4h9804lrETzioWEtYjLVPRRHt47hM hP4jhrJmZ7aZxWhNROVxfMORtWSjJnOd9xoyVAHGPxhonNTIzhFYi2Td6ylG6AjBuEq2 5ikcyQaTVr3PIM1NV457Mo4fuaisrO6RIuJM06YHO7JvMXBconza3mEu6kvxKZF0QJxa 01OO4S2eAmV2HBsqLT4/V8m8xbxWylhO9lDUbn0nsvqb7F4MIVfRH61dxWovhUJQa8he AWbnpAR5zzLJpzGo9P/DL1wNTvs9PH/N1FGU43wVgXPFjlHdYcZ1t8ANBQnoRNHrOrpI oSTg== X-Gm-Message-State: AOAM531TJbbD2iRvfvBwqDHMRPEOIqCOqdsuc8Vu+6KTlWZPSQB+hqeL +ogIeamTx44IPyjzvg4VAtXK5/tlHyZ0mx0i7K7pURpmzovupCCgkcgXGm2c7rX1mmJG+tYF01B /P2wCm31w9fcNwkzKSzn3CMtxl9IcR1NNA1QjTrLbUaMtLsESvNKF5/1gZqKWzr37 X-Received: by 2002:adf:c54a:: with SMTP id s10mr3382759wrf.405.1630667339158; Fri, 03 Sep 2021 04:08:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzopBsfgspfdDlrpZUpsr41FgOxa6kgWftrebygxzUBuKUb/fPiR/qlP4CZMfiKI3MKwkKmA== X-Received: by 2002:adf:c54a:: with SMTP id s10mr3382702wrf.405.1630667338948; Fri, 03 Sep 2021 04:08:58 -0700 (PDT) Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id e2sm4370145wra.40.2021.09.03.04.08.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 04:08:58 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 20/28] net/colo: Replace g_memdup() by g_memdup2_qemu() Date: Fri, 3 Sep 2021 13:06:54 +0200 Message-Id: <20210903110702.588291-21-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210903110702.588291-1-philmd@redhat.com> References: <20210903110702.588291-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 Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) DKIMWL_WL_HIGH=-0.392, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Peter Maydell , Li Zhijian , "Michael S. Tsirkin" , Jason Wang , Christian Schoenebeck , Yuval Shaia , Peter Xu , Gerd Hoffmann , Alexandre Iooss , Eric Blake , qemu-block@nongnu.org, Zhang Chen , =?utf-8?q?Alex_Benn=C3=A9e?= , Helge Deller , David Hildenbrand , Markus Armbruster , "Gonglei \(Arei\)" , Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier , Thomas Huth , Eduardo Habkost , Michael Roth , Richard Henderson , Greg Kurz , Alex Williamson , qemu-arm@nongnu.org, Paolo Bonzini , John Snow , David Gibson , Kevin Wolf , Vladimir Sementsov-Ogievskiy , Laurent Vivier , Shannon Zhao , Hanna Reitz , qemu-ppc@nongnu.org, Igor Mammedov , Mahmoud Mandour Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Per https://discourse.gnome.org/t/port-your-module-from-g-memdup-to-g-memdup2-now/5538 The old API took the size of the memory to duplicate as a guint, whereas most memory functions take memory sizes as a gsize. This made it easy to accidentally pass a gsize to g_memdup(). For large values, that would lead to a silent truncation of the size from 64 to 32 bits, and result in a heap area being returned which is significantly smaller than what the caller expects. This can likely be exploited in various modules to cause a heap buffer overflow. packet_new() is called from packet_enqueue() with size being 32-bit (of type SocketReadState::packet_len). Replace g_memdup() by the safer g_memdup2_qemu() wrapper. Signed-off-by: Philippe Mathieu-Daudé --- net/colo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/colo.c b/net/colo.c index 3a3e6e89a0c..cfe37b19eac 100644 --- a/net/colo.c +++ b/net/colo.c @@ -159,7 +159,7 @@ Packet *packet_new(const void *data, int size, int vnet_hdr_len) { Packet *pkt = g_slice_new0(Packet); - pkt->data = g_memdup(data, size); + pkt->data = g_memdup2_qemu(data, size); pkt->size = size; pkt->creation_ms = qemu_clock_get_ms(QEMU_CLOCK_HOST); pkt->vnet_hdr_len = vnet_hdr_len; @@ -214,7 +214,7 @@ Connection *connection_get(GHashTable *connection_track_table, Connection *conn = g_hash_table_lookup(connection_track_table, key); if (conn == NULL) { - ConnectionKey *new_key = g_memdup(key, sizeof(*key)); + ConnectionKey *new_key = g_memdup2_qemu(key, sizeof(*key)); conn = connection_new(key);