From nobody Wed May 15 02:35:56 2024 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=libvir-list-bounces@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=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1647514792; cv=none; d=zohomail.com; s=zohoarc; b=AaRQ5RU8Vlo3vzUoQg6gNNq6O9i0+MrRqpP3Jf9buNccZBvJBL6IZDkCDf/ucW/ggZtjQL+UsFPc3tgu99aTgPMbHUWXhi3dw1ZCQL/jKRP/aBiw0s3IyBXYMkBjh/ecicG38FEoOqCAE2dQadvfdQA6wRtJM6IS9+SRbNQv0o0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1647514792; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=myo604wi7X5/GT1eXyW+4xEsxBJ19Z0yTQxd3XHS638=; b=ZouBUAr25Bs/QYQOWTM1BbjxoH7JD0ONCz+e2VaUFSevpkvFdWOAM8sSkb90gr4f+LyHuiKyOBcHLhvvnULut8IMwktrDQ9Nrb+TSFZYAsfgaQXA4YQ2tIfiapeRefV7GDeze6uA/rerdLlHQuqoAsqxem1ODEBHQ/rhB3ZSWYc= 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=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: 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 1647514792529952.8067420276133; Thu, 17 Mar 2022 03:59:52 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-124-ltm3H6TCP1CSX_dUyRvWtQ-1; Thu, 17 Mar 2022 06:59:48 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BF29C180138A; Thu, 17 Mar 2022 10:59:45 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6599D46516C; Thu, 17 Mar 2022 10:59:44 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 01119194036A; Thu, 17 Mar 2022 10:59:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id EF39A194035E for ; Thu, 17 Mar 2022 10:59:42 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DAD1740E80F1; Thu, 17 Mar 2022 10:59:42 +0000 (UTC) Received: from work.fritz.box (unknown [10.39.195.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0397E40E80E1; Thu, 17 Mar 2022 10:59:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647514791; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=myo604wi7X5/GT1eXyW+4xEsxBJ19Z0yTQxd3XHS638=; b=IbmwhJpO3TekmwPi84WawCGnKQpVsrTGHVhj1cRic4EWoa2jo4payZIFEYG93NUAsnBMCI UToIVaz2fzjhkA0myPuWDopwR9Vb6uTKi+KdTnR4njAV2krxh+WGrAbgFVbRRkNmVucBM5 QQ+k2Ow4KbCRNMfUpxiZ84bRTxBAI8o= X-MC-Unique: ltm3H6TCP1CSX_dUyRvWtQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH] esx_stream: Fix NULL dereferences Date: Thu, 17 Mar 2022 11:59:40 +0100 Message-Id: <20220317105940.24309-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: phrdina@redhat.com, Tim Wiederhake Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1647514793683100001 Content-Type: text/plain; charset="utf-8" A wrong reordering caused "priv" to be derefenced before the NULL-check in esxStreamSend and esxStreamRecvFlags. Fixes: 12e19f172d2a908eec2a4557202ff764cdbb951e Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/esx/esx_stream.c | 102 +++++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 47 deletions(-) diff --git a/src/esx/esx_stream.c b/src/esx/esx_stream.c index 2b49c8dd12..b356fbed70 100644 --- a/src/esx/esx_stream.c +++ b/src/esx/esx_stream.c @@ -198,8 +198,8 @@ esxStreamTransfer(esxStreamPrivate *priv, bool blocking) static int esxStreamSend(virStreamPtr stream, const char *data, size_t nbytes) { + int result =3D -1; esxStreamPrivate *priv =3D stream->privateData; - VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->curl->lock); =20 if (nbytes =3D=3D 0) return 0; @@ -214,29 +214,33 @@ esxStreamSend(virStreamPtr stream, const char *data, = size_t nbytes) return -1; } =20 - priv->buffer =3D (char *)data; - priv->buffer_size =3D nbytes; - priv->buffer_used =3D nbytes; + VIR_WITH_MUTEX_LOCK_GUARD(&priv->curl->lock) { + priv->buffer =3D (char *)data; + priv->buffer_size =3D nbytes; + priv->buffer_used =3D nbytes; =20 - if (stream->flags & VIR_STREAM_NONBLOCK) { - if (esxStreamTransfer(priv, false) < 0) - return -1; + if (stream->flags & VIR_STREAM_NONBLOCK) { + if (esxStreamTransfer(priv, false) < 0) + return -1; =20 - if (priv->buffer_used >=3D priv->buffer_size) - return -2; - } else /* blocking */ { - do { - int status =3D esxStreamTransfer(priv, true); + if (priv->buffer_used >=3D priv->buffer_size) + return -2; + } else /* blocking */ { + do { + int status =3D esxStreamTransfer(priv, true); =20 - if (status < 0) - return -1; + if (status < 0) + return -1; + + if (status > 0) + break; + } while (priv->buffer_used > 0); + } =20 - if (status > 0) - break; - } while (priv->buffer_used > 0); + result =3D priv->buffer_size - priv->buffer_used; } =20 - return priv->buffer_size - priv->buffer_used; + return result; } =20 static int @@ -245,8 +249,8 @@ esxStreamRecvFlags(virStreamPtr stream, size_t nbytes, unsigned int flags) { + int result =3D -1; esxStreamPrivate *priv =3D stream->privateData; - VIR_LOCK_GUARD lock =3D virLockGuardLock(&priv->curl->lock); =20 virCheckFlags(0, -1); =20 @@ -263,40 +267,44 @@ esxStreamRecvFlags(virStreamPtr stream, return -1; } =20 - priv->buffer =3D data; - priv->buffer_size =3D nbytes; - priv->buffer_used =3D 0; - - if (priv->backlog_used > 0) { - if (priv->buffer_size > priv->backlog_used) - priv->buffer_used =3D priv->backlog_used; - else - priv->buffer_used =3D priv->buffer_size; + VIR_WITH_MUTEX_LOCK_GUARD(&priv->curl->lock) { + priv->buffer =3D data; + priv->buffer_size =3D nbytes; + priv->buffer_used =3D 0; + + if (priv->backlog_used > 0) { + if (priv->buffer_size > priv->backlog_used) + priv->buffer_used =3D priv->backlog_used; + else + priv->buffer_used =3D priv->buffer_size; + + memcpy(priv->buffer, priv->backlog, priv->buffer_used); + memmove(priv->backlog, priv->backlog + priv->buffer_used, + priv->backlog_used - priv->buffer_used); + + priv->backlog_used -=3D priv->buffer_used; + } else if (stream->flags & VIR_STREAM_NONBLOCK) { + if (esxStreamTransfer(priv, false) < 0) + return -1; =20 - memcpy(priv->buffer, priv->backlog, priv->buffer_used); - memmove(priv->backlog, priv->backlog + priv->buffer_used, - priv->backlog_used - priv->buffer_used); + if (priv->buffer_used <=3D 0) + return -2; + } else /* blocking */ { + do { + int status =3D esxStreamTransfer(priv, true); =20 - priv->backlog_used -=3D priv->buffer_used; - } else if (stream->flags & VIR_STREAM_NONBLOCK) { - if (esxStreamTransfer(priv, false) < 0) - return -1; + if (status < 0) + return -1; =20 - if (priv->buffer_used <=3D 0) - return -2; - } else /* blocking */ { - do { - int status =3D esxStreamTransfer(priv, true); - - if (status < 0) - return -1; + if (status > 0) + break; + } while (priv->buffer_used < priv->buffer_size); + } =20 - if (status > 0) - break; - } while (priv->buffer_used < priv->buffer_size); + result =3D priv->buffer_used; } =20 - return priv->buffer_used; + return result; } =20 static int --=20 2.31.1