From nobody Sun Apr 28 21:34:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505610001016119.90665703950867; Sat, 16 Sep 2017 18:00:01 -0700 (PDT) Received: from localhost ([::1]:59007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtNwF-0007cC-Mh for importer@patchew.org; Sat, 16 Sep 2017 20:59:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtNvU-0007Im-26 for qemu-devel@nongnu.org; Sat, 16 Sep 2017 20:59:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dtNvQ-0006dz-Vm for qemu-devel@nongnu.org; Sat, 16 Sep 2017 20:59:12 -0400 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:36949) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dtNvQ-0006ae-Mr for qemu-devel@nongnu.org; Sat, 16 Sep 2017 20:59:08 -0400 Received: by mail-lf0-x241.google.com with SMTP id q132so2879940lfe.4 for ; Sat, 16 Sep 2017 17:59:08 -0700 (PDT) Received: from localhost.localdomain (home.eubridge.org. [194.28.30.174]) by smtp.gmail.com with ESMTPSA id q68sm799536lfd.63.2017.09.16.17.59.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 16 Sep 2017 17:59:05 -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; bh=3/mZwGbz7e5RJ76RgzZcZhdLhWNxgDvKvgt4WRCiUvA=; b=tQ3J3jUmO22JS91gQ5pVRPoYKufs1xpMh0uqYdajt2SLaLXn45tvnDmm1ToZKCiQfk wv6NlnSPQkHudLImnBsdv6hjhlXe6U9wC3PlQXxYCk3aV7fNZSuHR18qUxYyjaDOT36z kvTq7Ft6kXUmosemP8kq0XeJ55iYAmtcBV55PlzrV4Dnw5Pws/kpJnHCjv/8swCDZVxd 2kgfwc+XWEPywrw7crBObXU8J2tJY0IbTDmDMJbp3n37KQcmTwcKOYqRpFaNK2Ii/WdQ o82yUBhlVKoFPwPujBRZy78TjthaRVsIidA6thIcJxI1lnq31xOONxwy+0z3w+l8dO1X 5lLg== 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; bh=3/mZwGbz7e5RJ76RgzZcZhdLhWNxgDvKvgt4WRCiUvA=; b=ehvCD6Qzzei1zVkGDfvbZBJloeoG/l2ArHsBwbRlKEjA4BCcl9zMSY2J8Mn2mHzO6O erY+2krARjxxbm5R5InUtfyh6hWzSBjZkF41lSUBuTWPaGKrJYrNbi3E230ePITPo5sm RiOFq6iOXHMlyUhkFC+X71dbU6dB+QktMgopsckQstWvx+/uoTb6mwGmzA5WIPpB8FTK KOXslfoThSR5zMmGysWorp0JkWS0PyKdLc3OCnkWI7z81HUeiw8JMmGiMSJZJVAyTT+E YLwk+F9dlRieZYjElkJnqb9VmUbUFelEG4CmkcC0bbiZAaHGkoF5DgUgcSYmt1bPNWaO q26Q== X-Gm-Message-State: AHPjjUj845E2hiMfYRzk2midON/DmgCRXchEhfaXv++puS5zirpClDS8 VQYJwsGXAr8izg== X-Google-Smtp-Source: AOwi7QDvr/QZN9acepQWKrusQjwpXJPhRd/iQNtlmOQsv1N5vKKV0jkYSyQLJ6uKtcsHLthoHZDZOg== X-Received: by 10.25.196.213 with SMTP id u204mr1603659lff.99.1505609946922; Sat, 16 Sep 2017 17:59:06 -0700 (PDT) From: Jan Dakinevich To: Greg Kurz , qemu-devel@nongnu.org Date: Sun, 17 Sep 2017 04:01:23 +0300 Message-Id: <1505610083-15519-1-git-send-email-jan.dakinevich@gmail.com> X-Mailer: git-send-email 2.1.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::241 Subject: [Qemu-devel] [PATCH] 9pfs: fix name_to_path assertion in v9fs_complete_rename() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jan Dakinevich , "Aneesh Kumar K.V" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The third parameter of v9fs_co_name_to_path() must not contain `/' character. The issue is most likely related to 9p2000.u protocol only. Signed-off-by: Jan Dakinevich --- hw/9pfs/9p.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 1ca0a7b..4d4ed85 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -2568,13 +2568,11 @@ static int coroutine_fn v9fs_complete_rename(V9fsPD= U *pdu, V9fsFidState *fidp, int32_t newdirfid, V9fsString *name) { - char *end; int err =3D 0; V9fsPath new_path; V9fsFidState *tfidp; V9fsState *s =3D pdu->s; V9fsFidState *dirfidp =3D NULL; - char *old_name, *new_name; =20 v9fs_path_init(&new_path); if (newdirfid !=3D -1) { @@ -2592,18 +2590,15 @@ static int coroutine_fn v9fs_complete_rename(V9fsPD= U *pdu, V9fsFidState *fidp, goto out; } } else { - old_name =3D fidp->path.data; - end =3D strrchr(old_name, '/'); - if (end) { - end++; - } else { - end =3D old_name; - } - new_name =3D g_malloc0(end - old_name + name->size + 1); - strncat(new_name, old_name, end - old_name); - strncat(new_name + (end - old_name), name->data, name->size); - err =3D v9fs_co_name_to_path(pdu, NULL, new_name, &new_path); - g_free(new_name); + char *dir_name =3D g_path_get_dirname(fidp->path.data); + V9fsPath dir_path; + + v9fs_path_init(&dir_path); + v9fs_path_sprintf(&dir_path, "%s", dir_name); + g_free(dir_name); + + err =3D v9fs_co_name_to_path(pdu, &dir_path, name->data, &new_path= ); + v9fs_path_free(&dir_path); if (err < 0) { goto out; } --=20 2.1.4