From nobody Thu May 16 16:45:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618933791; cv=none; d=zohomail.com; s=zohoarc; b=CZGCFJBcs8qoeQrukQvx6hEsFcpb+WcAJrhrrNJ8QJUz+tp7CO4PGV/6xo3nXNMmokQ7Gdq7VwQFQB4Hiza5hYJIDq8gKVeW+BKjXYExB/yZViaHMnV9bnNRUykUd4NrEkB9eU94DcgdjNY9vTC9j/I40OBjyeIoU3a7xzbOUYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618933791; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fOv18K+unub7ZcSn/HwTIzHYjgGINDh3Dq3WE9rC+yI=; b=JTGGtEJeKXhK15O7EtKm5d2cvIuGynazwfBNrlE8qI+PYacTSdyaQxKiJP04tfKjFfgTv7hmkeKXnUkLGKcC3dVvgHFg5CPG/yr+GCSfkjv7KGnEdvxF669RBP5xo0Kha5WIFMIW8fPPDijqpz3wDkEgVRZptJErcNLcaX8c3oM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618933791852341.2220939911698; Tue, 20 Apr 2021 08:49:51 -0700 (PDT) Received: from localhost ([::1]:37392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYsdK-0003IT-JG for importer@patchew.org; Tue, 20 Apr 2021 11:49:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYsbB-0001f1-AQ for qemu-devel@nongnu.org; Tue, 20 Apr 2021 11:47:37 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:36472) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYsb9-0003ME-Qs for qemu-devel@nongnu.org; Tue, 20 Apr 2021 11:47:37 -0400 Received: by mail-wm1-x32f.google.com with SMTP id o9-20020a1c41090000b029012c8dac9d47so13458441wma.1 for ; Tue, 20 Apr 2021 08:47:35 -0700 (PDT) Received: from localhost.localdomain ([197.61.162.183]) by smtp.googlemail.com with ESMTPSA id d5sm25025824wrx.15.2021.04.20.08.47.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 08:47:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fOv18K+unub7ZcSn/HwTIzHYjgGINDh3Dq3WE9rC+yI=; b=HeWJrZL5P6pZHyUIGQj2wqIXoWEoWiW3SlTnGAGQrA0Cba04yoZfgs5UkJvtKEFeT+ kAazKfbVrCrnJHb12H04AMbyn2+59YrKteVySydZgEDTO27frRfHw43ni/Uikn/j85Lc s/Mdj5Qy9pjUQw2aMufp52ctmTu+CwnZB+IsEeTBfiOz+qHbRg58+24GmmP9f4/UNuQr P3USfD/556ybqexytkB6qccck7NENCc4TOs9xdI23BdjNprJNEmr2OSwRHaxZ4D3Sn3z HNv0JOCJMfe+5D7NhjtMStI5W0qATLUooMVpb70VVmzZ9K3Y0owwBgdgE3E6+m07UpVj Sh0w== 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=fOv18K+unub7ZcSn/HwTIzHYjgGINDh3Dq3WE9rC+yI=; b=M9DZ822xEanreUoxZF+QAK7uHzGL7BfPAB0WTNz+XtogfZ9qzFK53zTMNfCqerBYZA A4DCpLB8GxC7z8DDPNh+hKdJoVhxPGJ5dYvSfijUPXcevffQvZlOCCGDG8nVnoZkO7kD vkEc+6oBwEi7y23jzwx8CTTrENB6ypeZgn/NCWtm8jzRz0s4yW84B5kFZthGzbUhcy5O W3298rjLN01YYHfvpzC8oYS1f+O+wqGwYax0J99CQIlOSWTuTt3kdd4ZvQED8VlTW/Jn GuS46+bIUmrrxpm/PtwJCS5oJOVkITtA3zpfAwohHYtwSuPhGQhSEThqo+bxbCXcko0A Fvow== X-Gm-Message-State: AOAM531/R2S0OrDpIy3mOOEkqSG0GtpEfctJTBli1jz9pLc5jG0o2+dX drxNx8+8Umh0tIzmEP616Fk64LNqZhc= X-Google-Smtp-Source: ABdhPJwySjN6pR1mUzIjvX3vtaSQND49s4ZMtmRhF5BxBBHl0Yy+hI9czo2az3HouecalAe5yJDgpQ== X-Received: by 2002:a1c:3587:: with SMTP id c129mr5011471wma.80.1618933654202; Tue, 20 Apr 2021 08:47:34 -0700 (PDT) From: Mahmoud Mandour To: qemu-devel@nongnu.org Subject: [PATCH v2 1/7] virtiofsd: Changed allocations of fuse_req to GLib functions Date: Tue, 20 Apr 2021 17:46:36 +0200 Message-Id: <20210420154643.58439-2-ma.mandourr@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210420154643.58439-1-ma.mandourr@gmail.com> References: <20210420154643.58439-1-ma.mandourr@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=ma.mandourr@gmail.com; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: "open list:virtiofs" , Mahmoud Mandour , "Dr. David Alan Gilbert" , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Replaced the allocation and deallocation of fuse_req structs using calloc()/free() call pairs to a GLib's g_try_new0() and g_free(). Signed-off-by: Mahmoud Mandour Reviewed-by: Stefan Hajnoczi --- tools/virtiofsd/fuse_lowlevel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowleve= l.c index 58e32fc963..812cef6ef6 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -106,7 +106,7 @@ static void list_add_req(struct fuse_req *req, struct f= use_req *next) static void destroy_req(fuse_req_t req) { pthread_mutex_destroy(&req->lock); - free(req); + g_free(req); } =20 void fuse_free_req(fuse_req_t req) @@ -130,7 +130,7 @@ static struct fuse_req *fuse_ll_alloc_req(struct fuse_s= ession *se) { struct fuse_req *req; =20 - req =3D (struct fuse_req *)calloc(1, sizeof(struct fuse_req)); + req =3D g_try_new0(struct fuse_req, 1); if (req =3D=3D NULL) { fuse_log(FUSE_LOG_ERR, "fuse: failed to allocate request\n"); } else { @@ -1684,7 +1684,7 @@ static struct fuse_req *check_interrupt(struct fuse_s= ession *se, if (curr->u.i.unique =3D=3D req->unique) { req->interrupted =3D 1; list_del_req(curr); - free(curr); + g_free(curr); return NULL; } } --=20 2.25.1 From nobody Thu May 16 16:45:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618933822; cv=none; d=zohomail.com; s=zohoarc; b=BRwqOjxQgGn/Neqiw3SuXIa1aqf7bhBBtGNOyugmQpW51Kh/5qVxuePY4OEtJ/oPzIz5tl9E8NMXEWjmfA8V2lLZkqJMCERiolR/FiELRRnCjDIw32r+frGmu/LI5Fua1iEKbRX6i0YjiKNP1/fZHUWF++cMOfMvPzev83vthF4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618933822; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zHUPL2SMYE0/WNVg5aveYt3okNxRR0QJ0JhoTKs4tEM=; b=k12qhVqf15M8M2dJ/7hCeBqKPyPpK+TQ0ZT3VRH5h+APEGiAV3xweZII63sjsWSd7TBGTHQDyhD3oWgiK8tjUsj3sF1CKAQ6yC9hi481AKxqqAXCawdjO/zdgAvNhV77xDcWAbEHv9pJhRx6HnXqvfbsSqwAlFxzp67+aXIrZaA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618933822451359.24933099097063; Tue, 20 Apr 2021 08:50:22 -0700 (PDT) Received: from localhost ([::1]:37596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYsdp-0003NK-9l for importer@patchew.org; Tue, 20 Apr 2021 11:50:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYsbC-0001gK-Rz for qemu-devel@nongnu.org; Tue, 20 Apr 2021 11:47:38 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:45583) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYsbA-0003O6-Ui for qemu-devel@nongnu.org; Tue, 20 Apr 2021 11:47:38 -0400 Received: by mail-wr1-x430.google.com with SMTP id h4so29099861wrt.12 for ; Tue, 20 Apr 2021 08:47:36 -0700 (PDT) Received: from localhost.localdomain ([197.61.162.183]) by smtp.googlemail.com with ESMTPSA id d5sm25025824wrx.15.2021.04.20.08.47.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 08:47:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zHUPL2SMYE0/WNVg5aveYt3okNxRR0QJ0JhoTKs4tEM=; b=AiuUT/S8ilQXj5mlQdFcSctG3Hkv+u2kX5NJVd8vXjeIkHc6JGBSpBjO7SAvqKMawo 5C7Igv064RwVbjonhv0qO5taw7xsS3h+RoEc5c3K1ySgeblD7EDJMP+Lb/yDlpMasvWP Iv498gJwpyHpSof5UyhZ6f4wLXtRpb9Onuj2u3DxffrcNdjsAB/k4DmVkQl+lg+MrxqH Hei11XB8tSM27+kMCziJwYE532mKRxMc2clvTjklRJv1sJZttspQRDJ9rXvwTbGgRb4u uNNfciYlonwbazZlrm5bmS1VcA+jUNrG8tII2Ot2H3ESKK/pX64xsaIKaL7ffdpiBRKa eKBA== 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=zHUPL2SMYE0/WNVg5aveYt3okNxRR0QJ0JhoTKs4tEM=; b=rYHWzL8LINE/LzieZTk2/HrCY6lJ+EU8nyOpqokPeXUU9TIUqM9unecaUpxh1Vte+A FU6ZfJnTR2HMga0bQSGHXjM/fjXKbMzH6B7C3hhM2PN429p/dH1ab4wQgpki3OOvf7h2 QqJxAiUk8YhPNqhtWg4ViAg/vHQtl27khO2501ZGMhK9CxSaOiKHgRCJO2pQrC4MMdg1 vudK7u0VyLe8TgO+/rN6h9tBneFTAbhzhqoT4OXxGXQjbrs6Kzgth7QZ/r3FPA5wp+RO /CGG3nmueY7S2MO9Yj3QlwpIijKTY5I20d5B8/U4P8+sQk5HVuDkRd6s0Go9d4xP8a38 zN0g== X-Gm-Message-State: AOAM531HSDT19mY12Dh1DtGzXqsJLLJQCwqfoeBTvWGV+mhXYXGZ3sd3 7CsDy9yRW0rQUwEhUFQmMpFzg1MGlAY= X-Google-Smtp-Source: ABdhPJxjzf5m8B9y8YFBrGvV0VUz7H9ZyX+bMTpdskZunSZsWOI5CGiFdyLSA3nofbN5KftwYSNweA== X-Received: by 2002:a5d:4010:: with SMTP id n16mr21527259wrp.225.1618933655415; Tue, 20 Apr 2021 08:47:35 -0700 (PDT) From: Mahmoud Mandour To: qemu-devel@nongnu.org Subject: [PATCH v2 2/7] virtiofds: Changed allocations of iovec to GLib's functions Date: Tue, 20 Apr 2021 17:46:37 +0200 Message-Id: <20210420154643.58439-3-ma.mandourr@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210420154643.58439-1-ma.mandourr@gmail.com> References: <20210420154643.58439-1-ma.mandourr@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=ma.mandourr@gmail.com; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: "open list:virtiofs" , Mahmoud Mandour , "Dr. David Alan Gilbert" , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Replaced the calls to malloc()/calloc() and their respective calls to free() of iovec structs with GLib's allocation and deallocation functions. Also, in one instance, used g_new0() instead of a calloc() call plus a null-checking assertion. iovec structs were created locally and freed as the function ends. Hence, I used g_autofree and removed the respective calls to free(). In one instance, a struct fuse_ioctl_iovec pointer is returned from a function, namely, fuse_ioctl_iovec_copy. There, I used g_steal_pointer() in conjunction with g_autofree, this gives the ownership of the pointer to the calling function and still auto-frees the memory when the calling function finishes (maintaining the symantics of previous code). Signed-off-by: Mahmoud Mandour Reviewed-by: Stefan Hajnoczi --- tools/virtiofsd/fuse_lowlevel.c | 19 +++++++------------ tools/virtiofsd/fuse_virtio.c | 6 +----- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowleve= l.c index 812cef6ef6..f965299ad9 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -217,9 +217,9 @@ static int send_reply(fuse_req_t req, int error, const = void *arg, int fuse_reply_iov(fuse_req_t req, const struct iovec *iov, int count) { int res; - struct iovec *padded_iov; + g_autofree struct iovec *padded_iov; =20 - padded_iov =3D malloc((count + 1) * sizeof(struct iovec)); + padded_iov =3D g_try_new(struct iovec, count + 1); if (padded_iov =3D=3D NULL) { return fuse_reply_err(req, ENOMEM); } @@ -228,7 +228,6 @@ int fuse_reply_iov(fuse_req_t req, const struct iovec *= iov, int count) count++; =20 res =3D send_reply_iov(req, 0, padded_iov, count); - free(padded_iov); =20 return res; } @@ -565,10 +564,10 @@ int fuse_reply_bmap(fuse_req_t req, uint64_t idx) static struct fuse_ioctl_iovec *fuse_ioctl_iovec_copy(const struct iovec *= iov, size_t count) { - struct fuse_ioctl_iovec *fiov; + g_autofree struct fuse_ioctl_iovec *fiov; size_t i; =20 - fiov =3D malloc(sizeof(fiov[0]) * count); + fiov =3D g_try_new(fuse_ioctl_iovec, count); if (!fiov) { return NULL; } @@ -578,7 +577,7 @@ static struct fuse_ioctl_iovec *fuse_ioctl_iovec_copy(c= onst struct iovec *iov, fiov[i].len =3D iov[i].iov_len; } =20 - return fiov; + return g_steal_pointer(&fiov); } =20 int fuse_reply_ioctl_retry(fuse_req_t req, const struct iovec *in_iov, @@ -629,9 +628,6 @@ int fuse_reply_ioctl_retry(fuse_req_t req, const struct= iovec *in_iov, =20 res =3D send_reply_iov(req, 0, iov, count); out: - free(in_fiov); - free(out_fiov); - return res; =20 enomem: @@ -663,11 +659,11 @@ int fuse_reply_ioctl(fuse_req_t req, int result, cons= t void *buf, size_t size) int fuse_reply_ioctl_iov(fuse_req_t req, int result, const struct iovec *i= ov, int count) { - struct iovec *padded_iov; + g_autofree struct iovec *padded_iov; struct fuse_ioctl_out arg; int res; =20 - padded_iov =3D malloc((count + 2) * sizeof(struct iovec)); + padded_iov =3D g_try_new(struct iovec, count + 2); if (padded_iov =3D=3D NULL) { return fuse_reply_err(req, ENOMEM); } @@ -680,7 +676,6 @@ int fuse_reply_ioctl_iov(fuse_req_t req, int result, co= nst struct iovec *iov, memcpy(&padded_iov[2], iov, count * sizeof(struct iovec)); =20 res =3D send_reply_iov(req, 0, padded_iov, count + 2); - free(padded_iov); =20 return res; } diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 3e13997406..07e5d91a9f 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -347,8 +347,7 @@ int virtio_send_data_iov(struct fuse_session *se, struc= t fuse_chan *ch, * Build a copy of the the in_sg iov so we can skip bits in it, * including changing the offsets */ - struct iovec *in_sg_cpy =3D calloc(sizeof(struct iovec), in_num); - assert(in_sg_cpy); + g_autofree struct iovec *in_sg_cpy =3D g_new0(struct iovec, in_num); memcpy(in_sg_cpy, in_sg, sizeof(struct iovec) * in_num); /* These get updated as we skip */ struct iovec *in_sg_ptr =3D in_sg_cpy; @@ -386,7 +385,6 @@ int virtio_send_data_iov(struct fuse_session *se, struc= t fuse_chan *ch, ret =3D errno; fuse_log(FUSE_LOG_DEBUG, "%s: preadv failed (%m) len=3D%zd\n", __func__, len); - free(in_sg_cpy); goto err; } fuse_log(FUSE_LOG_DEBUG, "%s: preadv ret=3D%d len=3D%zd\n", __func= __, @@ -410,13 +408,11 @@ int virtio_send_data_iov(struct fuse_session *se, str= uct fuse_chan *ch, if (ret !=3D len) { fuse_log(FUSE_LOG_DEBUG, "%s: ret!=3Dlen\n", __func__); ret =3D EIO; - free(in_sg_cpy); goto err; } in_sg_left -=3D ret; len -=3D ret; } while (in_sg_left); - free(in_sg_cpy); =20 /* Need to fix out->len on EOF */ if (len) { --=20 2.25.1 From nobody Thu May 16 16:45:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618933823; cv=none; d=zohomail.com; s=zohoarc; b=GuEZwioF05wZUTJMiQVdGu1jnexTKNhkZUdMXcFlOsqPdGNUJrAlMrV1v1pE8qi8WdPDN00m3CB9wzBQWYfj/A9tJidpM5GOU9eai4bh8UzWZ+KWgwcRXPCPlcPjih4gy+2crGLNkGHR1Ix7yUGfBw8cVXRtPTuyujfv+gLo8LU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618933823; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YgqSWgggc8NIZdLGsTHPcESqoSDlIYTq+9ZXTSuDuJM=; b=PMPMpsQxPEeX/+m2+hAtLngRl/worqkeswHtCyxmPk+++fFG+XjMYTDnsuFwq/DNEPq51MnO3qU91MzzAMPn8hH8lkeQIzA6l+Pm+7CHRVL/jmd2GsYn1DLmB2/B8OmTkuUEv9yyu+zU1zK3bWiQ6mMebhzh3Dsh5IvyszdS3S4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618933823546462.28134715242106; Tue, 20 Apr 2021 08:50:23 -0700 (PDT) Received: from localhost ([::1]:37650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYsdq-0003Oi-AP for importer@patchew.org; Tue, 20 Apr 2021 11:50:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYsbD-0001hh-Rl for qemu-devel@nongnu.org; Tue, 20 Apr 2021 11:47:39 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:45729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYsbC-0003OG-7O for qemu-devel@nongnu.org; Tue, 20 Apr 2021 11:47:39 -0400 Received: by mail-wm1-x335.google.com with SMTP id n4-20020a05600c4f84b029013151278decso9055529wmq.4 for ; Tue, 20 Apr 2021 08:47:37 -0700 (PDT) Received: from localhost.localdomain ([197.61.162.183]) by smtp.googlemail.com with ESMTPSA id d5sm25025824wrx.15.2021.04.20.08.47.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 08:47:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YgqSWgggc8NIZdLGsTHPcESqoSDlIYTq+9ZXTSuDuJM=; b=Y0f6hvJ0sVqlSteHNXY/4E5fm99CdPtRNXoq0VC6btvAStVgjT+0haXKmNT2VXzbD7 uICpGraQRHxynoRak714mcQDoJKeW+VL8HKjoXQfB3MDCpUEBv3Rldab3FrH5ZRyjyiX RcUYZa6Ra8SF9wj8acoGtm9MPx+wuFFAQtaWvB9i7RVRkTecK+BJ2KgZbWwhcQZvTBhp L/xi6eJES5/tr8Wryd0M1XK0vniR+T6BvVOMAQfUDOTzfjf58LdIlJ94rD/400yChGAP VjKK9DPMW+dXbfPNBRwG9a+/i2Kk1dfX4Q96xPRc7tE9vrX+qzxcMaYc9FaZFfDN01YK NQEA== 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=YgqSWgggc8NIZdLGsTHPcESqoSDlIYTq+9ZXTSuDuJM=; b=GP218E2O0xsF9wsxctBTJUd/WmT1WOn2eGlmy4YHcZdcSaykkGyv7wvinIoKkri/nB ivuS4xgKLLqDy/DP9lzaYpixVCyb9/gg+ngWTBbKF/dNT2X66HiMz+Ejn7mh1iFmOQGw ClIQOylyHYMItsUPQ9xMeib+BSe5/cP7OTmAj7JKohxbsEODY/K5iO/kH6biLKSQ9BI3 WTkXcIfa549lTbz95LfpC4ooia8FjQd68TTEtD7aMYL1VXL3fIou3cxriI0HOB5bLKYg mTPNKg9XnKv3X+gGETTqZTgjhTqfSx5wA4NcMFsyEFMb13c2Wg+oC17zighr/sRI1140 jwTw== X-Gm-Message-State: AOAM533R3HiPVDehUxMZQR28a5AsKbXkUZ269/wWSEwn6hNlUDIsq1r/ QSgSj6dNQMO9J8/Fpy8iZgqy+LFVto8= X-Google-Smtp-Source: ABdhPJzV5pmzec44tBoedxoesoVGcwAffNJ0JYlNC9Rql5uvqNDnhtbeK7D9EoTuT/MSYESbGsk5jw== X-Received: by 2002:a7b:c312:: with SMTP id k18mr5185472wmj.89.1618933656615; Tue, 20 Apr 2021 08:47:36 -0700 (PDT) From: Mahmoud Mandour To: qemu-devel@nongnu.org Subject: [PATCH v2 3/7] virtiofsd: Changed allocations of fuse_session to GLib's functions Date: Tue, 20 Apr 2021 17:46:38 +0200 Message-Id: <20210420154643.58439-4-ma.mandourr@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210420154643.58439-1-ma.mandourr@gmail.com> References: <20210420154643.58439-1-ma.mandourr@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=ma.mandourr@gmail.com; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: "open list:virtiofs" , Mahmoud Mandour , "Dr. David Alan Gilbert" , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Replaced the allocation and deallocation of fuse_session structs from calloc() and free() calls to g_try_new0() and g_free(). Signed-off-by: Mahmoud Mandour Reviewed-by: Stefan Hajnoczi --- tools/virtiofsd/fuse_lowlevel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowleve= l.c index f965299ad9..ecc20c9310 100644 --- a/tools/virtiofsd/fuse_lowlevel.c +++ b/tools/virtiofsd/fuse_lowlevel.c @@ -2472,7 +2472,7 @@ void fuse_session_destroy(struct fuse_session *se) free(se->vu_socket_path); se->vu_socket_path =3D NULL; =20 - free(se); + g_free(se); } =20 =20 @@ -2495,7 +2495,7 @@ struct fuse_session *fuse_session_new(struct fuse_arg= s *args, return NULL; } =20 - se =3D (struct fuse_session *)calloc(1, sizeof(struct fuse_session)); + se =3D g_try_new0(struct fuse_session, 1); if (se =3D=3D NULL) { fuse_log(FUSE_LOG_ERR, "fuse: failed to allocate fuse object\n"); goto out1; @@ -2555,7 +2555,7 @@ struct fuse_session *fuse_session_new(struct fuse_arg= s *args, out4: fuse_opt_free_args(args); out2: - free(se); + g_free(se); out1: return NULL; } --=20 2.25.1 From nobody Thu May 16 16:45:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618934012; cv=none; d=zohomail.com; s=zohoarc; b=l60jiUJZgmBsnXYAYBvEyLe/su95K7Mm+QGckc6/ia+QgFQSiaPeZOFeLwzRwNBvhpwe4rskdEodqpmNWJbaY+qYpsa47tF/Jrgaq+UsorPwGOBZde8JpNSUxH6Zu52NXBX/n6I/EPN+XPesrc9asITV4JCU/rnGpsZoRurrqxo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618934012; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6HbB1VAhhgUx/qaXvX023gMFsNxHJqdWOpClPBzOgFg=; b=RTfx2RgukOLd0pY83wkB8DkLD9lQd1KPVpmX2PaVHGUn42zG53y0gpd6k/AyIEGWBTIVEEwgp4s1qnFw4HQfYRxNMCrmwuNV/GVncI2ZaCEqBkfHL2H0X+Q3vgJBXF/eG9dTqi7G2h8G36BLCWUBtjoX0++QLWnQ72Qo4+sBPpU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618934012840806.910305305838; Tue, 20 Apr 2021 08:53:32 -0700 (PDT) Received: from localhost ([::1]:45510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYsgt-0006j5-Pc for importer@patchew.org; Tue, 20 Apr 2021 11:53:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYsbK-0001k2-Dw for qemu-devel@nongnu.org; Tue, 20 Apr 2021 11:47:46 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:39604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYsbD-0003Ok-Av for qemu-devel@nongnu.org; Tue, 20 Apr 2021 11:47:41 -0400 Received: by mail-wr1-x435.google.com with SMTP id s7so38049691wru.6 for ; Tue, 20 Apr 2021 08:47:38 -0700 (PDT) Received: from localhost.localdomain ([197.61.162.183]) by smtp.googlemail.com with ESMTPSA id d5sm25025824wrx.15.2021.04.20.08.47.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 08:47:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6HbB1VAhhgUx/qaXvX023gMFsNxHJqdWOpClPBzOgFg=; b=eQOtb/mEx8ubV0mvrl3wHhNnKbKYIPl1kXziZp6hUQC4FzecXfX7YnBa4my8Mj65zp ENNXamkQW/GwpcQ3IeqXIIyr0+wLjNQZa0+YfCCKHm1AxYxc9OizMduGhLMDnON3vxVd RVezCWJpRZr4bkDvjxzoc2U6eH9yxkwr/UB0gIPDg3cRZtFXENJR83z6C7WG8wXPe+8u Ze3o7cH2E5qQwU/ZPurIuKw5lwttxKc46hcArOyW0bjU056PPkoM/FACmFB8xhMFIPLF 6YJrA9HsQd+w+AUWdg79I2s5KnmQpWQRVKCd8gCnqUn76RdP518vdNUojpHatIBIleIm KAsA== 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=6HbB1VAhhgUx/qaXvX023gMFsNxHJqdWOpClPBzOgFg=; b=WEBP+j0+mGwQ5g0bDRVMBTxSaaMjCKTQEzeNnHuddhUo+7U1y1npFdcfPUIhoWAs4f 8MdOl8eo7baLOF65zqZ0yzEhaDL/Ibvu2+XTaH1i+Iklp71Nsdfcnf4fsdZgzEt7ia8G lD7gPzHoiKkyeiZl1pdyD9zg06VLzb6FPoUEgnb4d48nOTkV9lcQxo93hKNxKRUzdvE8 y2HyR2Uu2Tp2h9puFiB649qXoenElVtNVHpqevQP+GFykz9DOzqG4NqB/PrhAugQbDeG uEnsw1teCMWYqU8MEICpgvlOllNu+5C4ybGsNyunq38i5usfKZHkZM7uMZr9yf+Q2zYU O4XQ== X-Gm-Message-State: AOAM5314gEFKTrAqIVEJYAALFDYtQReArDp+GzuJq9IpUcoM7fAP8fae iUSWArtrlBngwK5/qcBXaf23Z1S9e6k= X-Google-Smtp-Source: ABdhPJzmAh5/SjUWHWPu758/ev4dKPzxVGiVrJZ/BOwkNbfaSVHQ633ypLHe61p/sGi5rXdoZEkCew== X-Received: by 2002:adf:cd82:: with SMTP id q2mr21606136wrj.255.1618933657846; Tue, 20 Apr 2021 08:47:37 -0700 (PDT) From: Mahmoud Mandour To: qemu-devel@nongnu.org Subject: [PATCH v2 4/7] virtiofsd: Changed allocation of lo_map_elems to GLib's functions Date: Tue, 20 Apr 2021 17:46:39 +0200 Message-Id: <20210420154643.58439-5-ma.mandourr@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210420154643.58439-1-ma.mandourr@gmail.com> References: <20210420154643.58439-1-ma.mandourr@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=ma.mandourr@gmail.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: "open list:virtiofs" , Mahmoud Mandour , "Dr. David Alan Gilbert" , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Replaced (re)allocation of lo_map_elem structs from realloc() to GLib's g_try_realloc_n() and replaced the respective free() call with a g_free(). Signed-off-by: Mahmoud Mandour Reviewed-by: Stefan Hajnoczi --- tools/virtiofsd/passthrough_ll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 1553d2ef45..b9260c26d4 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -406,7 +406,7 @@ static void lo_map_init(struct lo_map *map) =20 static void lo_map_destroy(struct lo_map *map) { - free(map->elems); + g_free(map->elems); } =20 static int lo_map_grow(struct lo_map *map, size_t new_nelems) @@ -418,7 +418,7 @@ static int lo_map_grow(struct lo_map *map, size_t new_n= elems) return 1; } =20 - new_elems =3D realloc(map->elems, sizeof(map->elems[0]) * new_nelems); + new_elems =3D g_try_realloc_n(map->elems, new_nelems, sizeof(map->elem= s[0])); if (!new_elems) { return 0; } --=20 2.25.1 From nobody Thu May 16 16:45:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618934210; cv=none; d=zohomail.com; s=zohoarc; b=AGvmifzBQZl7B/rntdnIotL0ubo3JoLjHtj2WTmZ7I/mP8/1f3RuccISPLUcYPyXTgZYBqccljj0t0jpQk9K9l+ebk692PMJuk31TesFCC5k1FWRbnecleUJ9vR6zpmzwPGxUvrE8D/D+k3trN46WJaGvAqbyVoSvmZJpeAEq1Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618934210; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DMmCP/nq64/5+dSP7ehwkK/KzSCcP4/pvUdlB1H1Ib8=; b=duH2R6qifJmO0XCRQgv0Iro7kVwKEDa8nqdtzBxcOx54ogvOsHsRjrtgDiZ7NHRTqonSQ1USwMhHxSbRsao+8Wr+HNRPUlfW9+gleL5cFeZ7F5bwliB1PfRofxeAaLslU6JPLkl4D8YUQRtbOtC7ozgYgS6bkz09qDl1YSXATKE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618934210813372.8606602889721; Tue, 20 Apr 2021 08:56:50 -0700 (PDT) Received: from localhost ([::1]:49796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYsk5-0000DU-3X for importer@patchew.org; Tue, 20 Apr 2021 11:56:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYsbO-0001mm-Te for qemu-devel@nongnu.org; Tue, 20 Apr 2021 11:47:52 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:45581) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYsbE-0003Pz-Go for qemu-devel@nongnu.org; Tue, 20 Apr 2021 11:47:50 -0400 Received: by mail-wr1-x42d.google.com with SMTP id h4so29100127wrt.12 for ; Tue, 20 Apr 2021 08:47:40 -0700 (PDT) Received: from localhost.localdomain ([197.61.162.183]) by smtp.googlemail.com with ESMTPSA id d5sm25025824wrx.15.2021.04.20.08.47.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 08:47:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DMmCP/nq64/5+dSP7ehwkK/KzSCcP4/pvUdlB1H1Ib8=; b=uyJe/qGT8CrrzJIynMquh4rDa+/5CQGgn6RE/u1a4p5RvDa7jTXAmZnb1Ouwl+BVLn cKnMB+bsd1tCTQl3gqLwGUkkfaq5OcXCBtkcFBfR6M/szumNJbQhSk+hH2KctK4O5xwO 2pGaOFxg6h/xTJXFJGIySm+A3MKk8GCNY2H5xXDSrbA37wJID4y/upxEtYmUZQ4javZn XXryLQBxNYdau/7XS+2/bbgkcItabe2Qz3QBPcrmIIKItZ0X6z3TxKA4NxcTyD3Qw1k+ CUrRG1C9kjBtnn1h0fvGBiOeMwCriAbZ2xfDNh+YdTs/Bvf4jLXI3vuRZUxImuUQgWR7 OIfw== 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=DMmCP/nq64/5+dSP7ehwkK/KzSCcP4/pvUdlB1H1Ib8=; b=Yrokg9GPacI4CZxTq6WKOoQeqMvOuB9lh9OQnNTQ3zE9hqyHQGMcOdxWc7M+CqoPyi FdpRXTzZMa0mVIe9GatVlg5R/IFBrFERSqDWx3T3jM7BLqjyNxmMV7zrUwybBbIpNGAy 5GIS2W4610liGnazxLuWl4GrAES5TKeEtNIDpUhJvXa5ai8HqjjVcJELZ0pEdvIsJjPF eVCI8wOMlCqaG8xn3hma4ZHnilSrxlFp658IrQeKx9MGStjmw3dDAXwUYmPj/FV0LLvX fT+Oci6VWK8Fap1hvpBDQpID3rNqiRJp0HUgxwM1YYVY28y1pzME4mnplrGl20H/xLs3 xgfA== X-Gm-Message-State: AOAM5304uXeO1Ogi8JLOafML5wLqal+vSOwesTAmFuLBY47Pm/6BNt6D 4KVLnKfqEtragPGGbcD3qXUbt0zAq2c= X-Google-Smtp-Source: ABdhPJwQO5co/FiAdNpEuPw2iBDh1Aa5MntwuDZU0lY8RfSS19XCIZkK+ZukN9gN+oRbhnp4Y66gMA== X-Received: by 2002:a5d:47c1:: with SMTP id o1mr19835060wrc.216.1618933659093; Tue, 20 Apr 2021 08:47:39 -0700 (PDT) From: Mahmoud Mandour To: qemu-devel@nongnu.org Subject: [PATCH v2 5/7] virtiofsd: Changed allocations of fv_VuDev & its internals to GLib functions Date: Tue, 20 Apr 2021 17:46:40 +0200 Message-Id: <20210420154643.58439-6-ma.mandourr@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210420154643.58439-1-ma.mandourr@gmail.com> References: <20210420154643.58439-1-ma.mandourr@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=ma.mandourr@gmail.com; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: "open list:virtiofs" , Mahmoud Mandour , "Dr. David Alan Gilbert" , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Changed the allocations of fv_VuDev structs, VuDev structs, and fv_QueueInfo strcuts from using calloc()/realloc() & free() to using the equivalent functions from GLib. In instances, removed the pair of allocation and assertion for non-NULL checking with a GLib function that aborts on error. Removed NULL-checking for fv_VuDev struct allocation and used a GLib function that crashes on error; namely, g_new0(). This is because allocating one struct should not be a problem on an healthy system. Also following the pattern of aborting-on-null behaviour that is taken with allocating VuDev structs and fv_QueueInfo structs. Signed-off-by: Mahmoud Mandour Reviewed-by: Stefan Hajnoczi --- tools/virtiofsd/fuse_virtio.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 07e5d91a9f..5828b9a76f 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -729,7 +729,7 @@ static void fv_queue_cleanup_thread(struct fv_VuDev *vu= d, int qidx) pthread_mutex_destroy(&ourqi->vq_lock); close(ourqi->kill_fd); ourqi->kick_fd =3D -1; - free(vud->qi[qidx]); + g_free(vud->qi[qidx]); vud->qi[qidx] =3D NULL; } =20 @@ -760,15 +760,13 @@ static void fv_queue_set_started(VuDev *dev, int qidx= , bool started) if (started) { /* Fire up a thread to watch this queue */ if (qidx >=3D vud->nqueues) { - vud->qi =3D realloc(vud->qi, (qidx + 1) * sizeof(vud->qi[0])); - assert(vud->qi); + vud->qi =3D g_realloc_n(vud->qi, qidx + 1, sizeof(vud->qi[0])); memset(vud->qi + vud->nqueues, 0, sizeof(vud->qi[0]) * (1 + (qidx - vud->nqueues))); vud->nqueues =3D qidx + 1; } if (!vud->qi[qidx]) { - vud->qi[qidx] =3D calloc(sizeof(struct fv_QueueInfo), 1); - assert(vud->qi[qidx]); + vud->qi[qidx] =3D g_new0(struct fv_QueueInfo, 1); vud->qi[qidx]->virtio_dev =3D vud; vud->qi[qidx]->qidx =3D qidx; } else { @@ -1034,12 +1032,7 @@ int virtio_session_mount(struct fuse_session *se) __func__); =20 /* TODO: Some cleanup/deallocation! */ - se->virtio_dev =3D calloc(sizeof(struct fv_VuDev), 1); - if (!se->virtio_dev) { - fuse_log(FUSE_LOG_ERR, "%s: virtio_dev calloc failed\n", __func__); - close(data_sock); - return -1; - } + se->virtio_dev =3D g_new0(struct fv_VuDev, 1); =20 se->vu_socketfd =3D data_sock; se->virtio_dev->se =3D se; @@ -1061,8 +1054,8 @@ void virtio_session_close(struct fuse_session *se) return; } =20 - free(se->virtio_dev->qi); + g_free(se->virtio_dev->qi); pthread_rwlock_destroy(&se->virtio_dev->vu_dispatch_rwlock); - free(se->virtio_dev); + g_free(se->virtio_dev); se->virtio_dev =3D NULL; } --=20 2.25.1 From nobody Thu May 16 16:45:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618934215; cv=none; d=zohomail.com; s=zohoarc; b=ImWQnikkVxU/Ihipg9mCIqZzhG08k30uKRLzBH9x5hLHMilr5AspbSCdFDde7tS3ZjQx+tBI9WqyAjYQQsXpJ3lSDRUV7TOom/pfpyVGzGmR3PwarvZYxV62jKDpMEHvxq1rkhcASUeO/IbtFFOn+60xgpa22pqciEkvk5kaLGQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618934215; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LrbTd6tSNQjqaBaj1lpQXcV7DowubxzC111+FmraES4=; b=VSm1x2L2M0O/OIToSfgHAoR1YMVsitXQeKoxLzF/h8+jUekeqV8wNSPqJWyNwbXMiB9UCe9AhM3Jik4qo7Swq6DcwilN1bTO0vPH1McC+SVGT9xqbP2A9NqpS0B0UYzBoz/ZgWjWVSD1iJy2bl4jIYWoLOHcr8tqBDf18XLddlI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618934214860800.2972052131363; Tue, 20 Apr 2021 08:56:54 -0700 (PDT) Received: from localhost ([::1]:49924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYsk9-0000H8-HC for importer@patchew.org; Tue, 20 Apr 2021 11:56:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYsbQ-0001nN-UN for qemu-devel@nongnu.org; Tue, 20 Apr 2021 11:47:57 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:34643) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYsbK-0003QO-3f for qemu-devel@nongnu.org; Tue, 20 Apr 2021 11:47:52 -0400 Received: by mail-wr1-x433.google.com with SMTP id r7so26124743wrm.1 for ; Tue, 20 Apr 2021 08:47:41 -0700 (PDT) Received: from localhost.localdomain ([197.61.162.183]) by smtp.googlemail.com with ESMTPSA id d5sm25025824wrx.15.2021.04.20.08.47.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 08:47:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LrbTd6tSNQjqaBaj1lpQXcV7DowubxzC111+FmraES4=; b=KetU5L0oYdz+enH/xtchCDwmc2o+w40N8VfbpoR5w8ixB0GzrCzo41FGsnc+iVZA3p Rui9+FQngfe9DHiiIIWuwWcylCh9pkCoG6X/L8zis6H0126T7uNh0yik0m91bYPlIJdb 61p/DkGBLPpi9fHwDKgxzgrgqFQ3SnDoLhkW/H4T+WR6DqNBMCoRZ2l+lWl1r2METv5X 2M+VNMGbD0sQaxafRXQFTNhu25O5nycp7cNBzpk8AG67DxtfpSmMJY6C1T4VGvkEPMoL eMLPweBCBH/YKGNezBUepPf8zcn0jTD7OWVPIXdPgYy6zt8doZED6vSY/6eBYeTCLoBn 3K3A== 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=LrbTd6tSNQjqaBaj1lpQXcV7DowubxzC111+FmraES4=; b=P2dbngujiNmS/Gz6bDXmyNmgoGJKK540GWO1YyxByTKQz/893b2brgUiHVPWltFlcN L9Ksd7tTOm+ufRdlM90OHKi6G0lUH2jecaTVpjgnoUloBr4JidRpYSWCTu6JDK+2gnlV dZ21jIKHeY7nFplRp5rbWFEYMfG7DlJ+9vR/c6IlzIprYFnJ3oSCs+SZKYlrPoyGfb0z N5icLQKJIkMZAyH93XFgwP0Xga1mVllG2n7t6YICjw0ABjkaEOZr5aNzrHQkjfLg9OqA bGWsnWod1O16kdJux+b9R79bo0tMuqwsBaujSLwTbt3SZYDl8EDtYwRPJ0s5mt9DLVqA 7V9g== X-Gm-Message-State: AOAM5322wXTjwEK8xInrSQ3HM9sRlMvoCc+QEGtlocNDMIphhFKC7zSq Gc9vNAvIOK9Sh0JPtIJVEwsGc6GCEjw= X-Google-Smtp-Source: ABdhPJzdQxbf1AiHvCxmg5nx87g2VRK3wAu1EWJHm+Alfa0go7Mr8GswsxytQE77qzAz7cosiZCNgA== X-Received: by 2002:a5d:65d2:: with SMTP id e18mr21674915wrw.31.1618933660297; Tue, 20 Apr 2021 08:47:40 -0700 (PDT) From: Mahmoud Mandour To: qemu-devel@nongnu.org Subject: [PATCH v2 6/7] virtiofsd/passthrough_ll.c: Changed local allocations to GLib functions Date: Tue, 20 Apr 2021 17:46:41 +0200 Message-Id: <20210420154643.58439-7-ma.mandourr@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210420154643.58439-1-ma.mandourr@gmail.com> References: <20210420154643.58439-1-ma.mandourr@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=ma.mandourr@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: "open list:virtiofs" , Mahmoud Mandour , "Dr. David Alan Gilbert" , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Changed the allocations of some local variables to GLib's allocation functions, such as g_try_malloc0(), and annotated those variables as g_autofree. Subsequently, I was able to remove the calls to free(). Signed-off-by: Mahmoud Mandour Reviewed-by: Stefan Hajnoczi --- tools/virtiofsd/passthrough_ll.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index b9260c26d4..886498e8c3 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -1653,7 +1653,7 @@ static void lo_do_readdir(fuse_req_t req, fuse_ino_t = ino, size_t size, struct lo_data *lo =3D lo_data(req); struct lo_dirp *d =3D NULL; struct lo_inode *dinode; - char *buf =3D NULL; + g_autofree char *buf =3D NULL; char *p; size_t rem =3D size; int err =3D EBADF; @@ -1669,7 +1669,7 @@ static void lo_do_readdir(fuse_req_t req, fuse_ino_t = ino, size_t size, } =20 err =3D ENOMEM; - buf =3D calloc(1, size); + buf =3D g_try_malloc0(size); if (!buf) { goto error; } @@ -1755,7 +1755,6 @@ error: } else { fuse_reply_buf(req, buf, size - rem); } - free(buf); } =20 static void lo_readdir(fuse_req_t req, fuse_ino_t ino, size_t size, @@ -2727,7 +2726,7 @@ static void lo_getxattr(fuse_req_t req, fuse_ino_t in= o, const char *in_name, size_t size) { struct lo_data *lo =3D lo_data(req); - char *value =3D NULL; + g_autofree char *value =3D NULL; char procname[64]; const char *name; char *mapped_name; @@ -2768,7 +2767,7 @@ static void lo_getxattr(fuse_req_t req, fuse_ino_t in= o, const char *in_name, ino, name, size); =20 if (size) { - value =3D malloc(size); + value =3D g_try_malloc(size); if (!value) { goto out_err; } @@ -2807,8 +2806,6 @@ static void lo_getxattr(fuse_req_t req, fuse_ino_t in= o, const char *in_name, fuse_reply_xattr(req, ret); } out_free: - free(value); - if (fd >=3D 0) { close(fd); } @@ -2827,7 +2824,7 @@ out: static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size) { struct lo_data *lo =3D lo_data(req); - char *value =3D NULL; + g_autofree char *value =3D NULL; char procname[64]; struct lo_inode *inode; ssize_t ret; @@ -2849,7 +2846,7 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t i= no, size_t size) size); =20 if (size) { - value =3D malloc(size); + value =3D g_try_malloc(size); if (!value) { goto out_err; } @@ -2934,8 +2931,6 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t i= no, size_t size) fuse_reply_xattr(req, ret); } out_free: - free(value); - if (fd >=3D 0) { close(fd); } --=20 2.25.1 From nobody Thu May 16 16:45:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618934015; cv=none; d=zohomail.com; s=zohoarc; b=GsvzQddNtJvPSogLSd0S/Sgnkk6isFEP+5Bjxl8oezWiAZQcOfI5zYbcvTK1DjnW9zu0VMi8tOiCxRJb+gxrH7prHszQ4kWJfvzU5yDwJm4Za0SXBT6iTcMJyngroaXGbTs08g5DCN22FkjFZR3b2nDJU67X2W34Q2U1p532eNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618934015; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Fg7014VWMzQTkIEvl7LENz5/48AAvautKhUCOqhNxxQ=; b=FL0smqREmdPHK0AcK8WRklJujYt32Q433t/0MYwKbHWFKma2WYzJ23IEEzR1ZHuEmsYg2KHRKjXnKeOpL/+25FcI5LS9YaQ6GKcQ/DzjqCEdbY1HJDFTVvRnqIFq4sSTrhfttt05SafR3tVBRLEI2Ox5QR6IBCas16DkIixIg5k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618934015691245.5983661300777; Tue, 20 Apr 2021 08:53:35 -0700 (PDT) Received: from localhost ([::1]:45694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYsgw-0006oA-Jv for importer@patchew.org; Tue, 20 Apr 2021 11:53:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYsbN-0001m8-2S for qemu-devel@nongnu.org; Tue, 20 Apr 2021 11:47:50 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:38841) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYsbK-0003QT-3l for qemu-devel@nongnu.org; Tue, 20 Apr 2021 11:47:48 -0400 Received: by mail-wm1-x32c.google.com with SMTP id d200-20020a1c1dd10000b02901384767d4a5so4359683wmd.3 for ; Tue, 20 Apr 2021 08:47:42 -0700 (PDT) Received: from localhost.localdomain ([197.61.162.183]) by smtp.googlemail.com with ESMTPSA id d5sm25025824wrx.15.2021.04.20.08.47.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 08:47:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Fg7014VWMzQTkIEvl7LENz5/48AAvautKhUCOqhNxxQ=; b=c+UJd+1qsSDp1lVZOwZ3dvdRxzZzclTMtzWLcepJqC/y+8t4QyiSflvFGgfTMa7X0/ 20kysU49505eCIwz2NenfzUGztxACJ+SmLcKbQWd/y/8g2JvIxl7T6itzFa4oB+7O9Vy ksfkHCqjef7FGVHQcilKh5xT4nLE4duANApD5VRGqZqehoUdqICv1zr9kzzT1Foun4VX pY4plgcZNaCwEaXiMyAfRX1sBQhUKKZn4FJzRxpT90wlj7T6ZEyF/Fo8Ad5w+FANjD2c lLBIF7ZKoWgnNhiXe9iWgFqsk9Rucosvz4UlPUvny5wBf+IMHxGbSig5ICXZ0t+WN/n2 Yuew== 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=Fg7014VWMzQTkIEvl7LENz5/48AAvautKhUCOqhNxxQ=; b=APN+J0V3YHAS6rJYztctZZKfuNL6jH+BrGO2p3i6LVDR1YHIlFfYdXzKDLM4D1vSog f2AcImO8yyZqTp16WQQwyT+xk2ZCE5S2EKW2Lb+ZJwh8OVAuFcRBBhCbCdIk5iPi5nUw QWPj5PVnOW7NMxPDFj7Dw6zglo5rmpumdpzH7ZkXFBhF9c8AJJkqx7G+eh9bxuKfiu1X Vv2DAaKZ5O4mZpEatJpDMlc0s3+zncyQyouhk/Chth4vuMN15lo+fGWbriQMuQOkBlkC Yz5bqgcK/ZJOvjiXCAFe9BPdRnD441eA19oUII6XvQuYxDV9482yAlD+UEeWTo2tc2uA oCQw== X-Gm-Message-State: AOAM53204/C19nfW3zkPQiqqd2YreCjwgpvkTJVjKN5NHZvWDnrN7Vl2 OlPf9wrtDi1wokID4226MTk4PShrmNI= X-Google-Smtp-Source: ABdhPJxbUIwdPxIK4rjL7cwKKHrobRzaxfoEOC7jk1eXdv3AaV2K42vaygeeRj1uwAdQsRhi6eI92g== X-Received: by 2002:a1c:c918:: with SMTP id f24mr5265541wmb.12.1618933661446; Tue, 20 Apr 2021 08:47:41 -0700 (PDT) From: Mahmoud Mandour To: qemu-devel@nongnu.org Subject: [PATCH v2 7/7] virtiofsd/fuse_virtio.c: Changed allocations of locals to GLib Date: Tue, 20 Apr 2021 17:46:42 +0200 Message-Id: <20210420154643.58439-8-ma.mandourr@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210420154643.58439-1-ma.mandourr@gmail.com> References: <20210420154643.58439-1-ma.mandourr@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=ma.mandourr@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: "open list:virtiofs" , Mahmoud Mandour , "Dr. David Alan Gilbert" , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Replaced the allocation of local variables from malloc() to GLib allocation functions. In one instance, dropped the usage to an assert after a malloc() call and used g_malloc() instead. Signed-off-by: Mahmoud Mandour Reviewed-by: Stefan Hajnoczi --- tools/virtiofsd/fuse_virtio.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 5828b9a76f..587403b026 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -472,8 +472,7 @@ static void fv_queue_worker(gpointer data, gpointer use= r_data) * They're spread over multiple descriptors in a scatter/gather set * and we can't trust the guest to keep them still; so copy in/out. */ - fbuf.mem =3D malloc(se->bufsize); - assert(fbuf.mem); + fbuf.mem =3D g_malloc(se->bufsize); =20 fuse_mutex_init(&req->ch.lock); req->ch.fd =3D -1; @@ -524,7 +523,7 @@ static void fv_queue_worker(gpointer data, gpointer use= r_data) fbuf.size =3D out_sg[0].iov_len + out_sg[1].iov_len; =20 /* Allocate the bufv, with space for the rest of the iov */ - pbufv =3D malloc(sizeof(struct fuse_bufvec) + + pbufv =3D g_try_malloc(sizeof(struct fuse_bufvec) + sizeof(struct fuse_buf) * (out_num - 2)); if (!pbufv) { fuse_log(FUSE_LOG_ERR, "%s: pbufv malloc failed\n", @@ -569,7 +568,7 @@ static void fv_queue_worker(gpointer data, gpointer use= r_data) =20 out: if (allocated_bufv) { - free(pbufv); + g_free(pbufv); } =20 /* If the request has no reply, still recycle the virtqueue element */ @@ -588,7 +587,7 @@ out: } =20 pthread_mutex_destroy(&req->ch.lock); - free(fbuf.mem); + g_free(fbuf.mem); free(req); } =20 --=20 2.25.1