From patchwork Thu Jun 2 03:54:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ihar Hrachyshka X-Patchwork-Id: 1638210 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=VU59rKIN; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LDBxD0zW0z9sFk for ; Thu, 2 Jun 2022 13:55:11 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id D60E44187F; Thu, 2 Jun 2022 03:55:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 56jkks0YXwHU; Thu, 2 Jun 2022 03:55:08 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp4.osuosl.org (Postfix) with ESMTPS id BBD74416EF; Thu, 2 Jun 2022 03:55:07 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 8AED4C0039; Thu, 2 Jun 2022 03:55:07 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id B8423C002D for ; Thu, 2 Jun 2022 03:55:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A3D9160774 for ; Thu, 2 Jun 2022 03:55:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=redhat.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JpG2ih37ivkM for ; Thu, 2 Jun 2022 03:55:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp3.osuosl.org (Postfix) with ESMTPS id 01F006076C for ; Thu, 2 Jun 2022 03:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654142104; 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; bh=RIFALAzFp/eWrzsXvf1kYGl+Fm8bYvZzl8o8ZiBdbuI=; b=VU59rKINmzHIVpi89Qwb7j8XHQNgzuSeYAe5s+m+5GaZ1/U7Xbh0YLmQkqg8gbMRVT1N5P TgGRSnfQx1JMAdZXHATG74pLnpMZHreWcDWks9PMsWL4f1W1rFQDi/B4caOQrHwwd+Hx/h wNSL5mT0SQCeJfLMK7hr0dkF4GnfBHs= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-158-t0DweEB9M5uIp2BmFr2Jzg-1; Wed, 01 Jun 2022 23:55:02 -0400 X-MC-Unique: t0DweEB9M5uIp2BmFr2Jzg-1 Received: by mail-qk1-f197.google.com with SMTP id c16-20020ae9e210000000b006a32c6a3830so2801436qkc.12 for ; Wed, 01 Jun 2022 20:55:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RIFALAzFp/eWrzsXvf1kYGl+Fm8bYvZzl8o8ZiBdbuI=; b=QSwLoSDBbqdzc/lX1lezsHIU6QF3ca9pGVqsbDbkR/zVdWjWbCjPPuleevGwmtVRu7 j/TqYW4qhT/W7DSFy7vymNngGrxx3CocwVRwclDEr4iO54DY/KRbvX3QG3W1rCwFGuxM r3NDpNkBCuXfgnp4zZyXzC7yQrDTiHTITFuHq+lfoDFGMARxPZxVoozLOhOtS59uTssL eXjRu83L8/ca6BlBISzYbDTFihVLzEpoPfqIAjcm9MQY14x5O4YNuLak5kOnK6yDayb6 S/b3hvBROONgPAOjtAK82Fn7RUKVYrDCfR2mcTSHXZ6sY75fK38k5Yxx8EboBHw8EFi/ 7Zug== X-Gm-Message-State: AOAM530NAhPiz+yHMa6Rjw1wKsHrBpxr1o2LsgK1VCZfmC1u5sB18CF7 /SzprdaaDaPDJUqYld1f49Ymyi4YD7PPKI2NMB/yLVnQVMT7BUdsR6C375vjXS81P6YcCpIkrBr xS6sU/zY+ygVxE9L3i/FPbMpb4Ns3Xq08ixJb50NhZRMgte+H8me2aD+O1+a8LX+/ X-Received: by 2002:a05:622a:44b:b0:2f9:3af4:d451 with SMTP id o11-20020a05622a044b00b002f93af4d451mr2263457qtx.587.1654142101209; Wed, 01 Jun 2022 20:55:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyGKC43NY66AcTaA5kQF1JzPYDAKqc+Hx5KXACg3y14S0VycfsKoTBh8Voi/6iijO6QH+0aCg== X-Received: by 2002:a05:622a:44b:b0:2f9:3af4:d451 with SMTP id o11-20020a05622a044b00b002f93af4d451mr2263446qtx.587.1654142100914; Wed, 01 Jun 2022 20:55:00 -0700 (PDT) Received: from fedora34.localdomain (cpe-172-73-180-250.carolina.res.rr.com. [172.73.180.250]) by smtp.gmail.com with ESMTPSA id bc8-20020a05622a1cc800b00304bc47a690sm2251084qtb.44.2022.06.01.20.54.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jun 2022 20:55:00 -0700 (PDT) From: Ihar Hrachyshka To: dev@openvswitch.org Date: Thu, 2 Jun 2022 03:54:56 +0000 Message-Id: <20220602035456.3772669-1-ihrachys@redhat.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ihrachys@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn] Fix ubsan warning on 0-len memcpy from NULL pointer X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Fixes fa8c591fa2a7("Support LSP:options:requested-chassis as a list") Signed-off-by: Ihar Hrachyshka Acked-by: Dumitru Ceara --- controller/binding.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/controller/binding.c b/controller/binding.c index 8a8570f13..2279570f9 100644 --- a/controller/binding.c +++ b/controller/binding.c @@ -944,8 +944,10 @@ append_additional_encap(const struct sbrec_port_binding *pb, { struct sbrec_encap **additional_encap = xmalloc( (pb->n_additional_encap + 1) * (sizeof *additional_encap)); - memcpy(additional_encap, pb->additional_encap, - pb->n_additional_encap * (sizeof *additional_encap)); + if (pb->n_additional_encap) { + memcpy(additional_encap, pb->additional_encap, + pb->n_additional_encap * (sizeof *additional_encap)); + } additional_encap[pb->n_additional_encap] = (struct sbrec_encap *) encap; sbrec_port_binding_set_additional_encap( pb, additional_encap, pb->n_additional_encap + 1); @@ -1012,8 +1014,10 @@ append_additional_chassis(const struct sbrec_port_binding *pb, { struct sbrec_chassis **additional_chassis = xmalloc( (pb->n_additional_chassis + 1) * (sizeof *additional_chassis)); - memcpy(additional_chassis, pb->additional_chassis, - pb->n_additional_chassis * (sizeof *additional_chassis)); + if (pb->n_additional_chassis) { + memcpy(additional_chassis, pb->additional_chassis, + pb->n_additional_chassis * (sizeof *additional_chassis)); + } additional_chassis[pb->n_additional_chassis] = ( (struct sbrec_chassis *) chassis_rec); sbrec_port_binding_set_additional_chassis(