From nobody Fri May 3 01:57:21 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 1505608620360382.32427576768066; Sat, 16 Sep 2017 17:37:00 -0700 (PDT) Received: from localhost ([::1]:58975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtNZy-0003J9-Nj for importer@patchew.org; Sat, 16 Sep 2017 20:36:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58451) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dtNZ4-0002v1-8w for qemu-devel@nongnu.org; Sat, 16 Sep 2017 20:36:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dtNZ1-0006vK-6W for qemu-devel@nongnu.org; Sat, 16 Sep 2017 20:36:02 -0400 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:33672) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dtNZ0-0006u7-UL for qemu-devel@nongnu.org; Sat, 16 Sep 2017 20:35:59 -0400 Received: by mail-lf0-x241.google.com with SMTP id y15so2883432lfd.0 for ; Sat, 16 Sep 2017 17:35:58 -0700 (PDT) Received: from localhost.localdomain (home.eubridge.org. [194.28.30.174]) by smtp.gmail.com with ESMTPSA id q17sm816919lfi.12.2017.09.16.17.35.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 16 Sep 2017 17:35:56 -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=AW3cgQOXruukIdrfNC4GnUfdmi9t0nzPo9nHjcyOg84=; b=OCsG3cmo8GZezwT/Jg/hi1PpCXk+4LfTL4d0y38lMIUdlAd1SeytHxEMRXcI9UJ/8Y 5ygvb18soEQVk8TJjjwkv54DUrgRoLjSaf7BqH1QZnEoEOZRVSsPw3K1GB/OEVJRbMkA uJLRi3hZJVPucSgP0APrJACR8D1+DvTBxpDyH+qHNhYCdPhooPM/9k3N8kcC8fdY8llA ATLJEvKEep8CQU1yD5UrNdMUYoP/MXejUnc8IePWPU/aeBPdHqIkI3ZkvRYyVJDVnoHY DEvkJVE/OsVPV28BHslY6vAjELFiUHRH3DOyTbg2cSHV1B6e3SUFv2llOv94l22jTCjI v91A== 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=AW3cgQOXruukIdrfNC4GnUfdmi9t0nzPo9nHjcyOg84=; b=Q3v2f0yxFDaKH5tjAO8Ed9S/fAZflzGgMg1Swy1Xm0EhpX2i0eC38NR6m9WigFRYvK Jrfyop0tR3HzCvONAOm1+mGZBoPRIrSB+SL0iT6M+47YURFvL5hwfxoBIiQEFNppHyUw PczJ8YskCGSDY6604/y5IXojw+sn3HfQaLwLJL/vBx0YtiIjgm/7ibe98DELmy99Dh/I ffU4UntH4Cn6ZykWAsTRhevbEbhtLTu7fzCKgCJZLm2tBQvLLgHrYCNunJDIr/MX9Kw9 Rk3TmLbGZ47E65Bq6vUkVxbo5LKsmGvby+1pn03QtdXdB4/SETE60U2z4dCfTuNLaSfq 2mCw== X-Gm-Message-State: AHPjjUij0ywTRkP949dQ7D4OFChecYGP8+bDB0Cdr7hQdAc10/B6igo8 dC2kRM08lzDpqw== X-Google-Smtp-Source: AOwi7QDGoQdXD2xIlG6NnKvoN1xEc0oRtN4dyy30repwpjv8qn1WPzFyvj9THZhtr4KrKaGweSnMeA== X-Received: by 10.46.99.132 with SMTP id s4mr1107328lje.7.1505608557368; Sat, 16 Sep 2017 17:35:57 -0700 (PDT) From: Jan Dakinevich To: Greg Kurz , qemu-devel@nongnu.org Date: Sun, 17 Sep 2017 03:38:11 +0300 Message-Id: <1505608691-11975-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 v2] 9pfs: check the size of transport buffer before marshaling 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" v9fs_do_readdir_with_stat() should check for a maximum buffer size before an attempt to marshal gathered data. Otherwise, buffers assumed as misconfigured and the transport would be broken. The patch brings v9fs_do_readdir_with_stat() in conformity with v9fs_do_readdir() behavior. Signed-off-by: Jan Dakinevich --- hw/9pfs/9p.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 144c330..4d4ed85 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -1754,17 +1754,26 @@ static int coroutine_fn v9fs_do_readdir_with_stat(V= 9fsPDU *pdu, if (err < 0) { break; } + if ((count + v9stat.size + 2) > max_count) { + v9fs_readdir_unlock(&fidp->fs.dir); + + /* Ran out of buffer. Set dir back to old position and return = */ + v9fs_co_seekdir(pdu, fidp, saved_dir_pos); + v9fs_stat_free(&v9stat); + v9fs_path_free(&path); + return count; + } + /* 11 =3D 7 + 4 (7 =3D start offset, 4 =3D space for storing count= ) */ len =3D pdu_marshal(pdu, 11 + count, "S", &v9stat); =20 v9fs_readdir_unlock(&fidp->fs.dir); =20 - if ((len !=3D (v9stat.size + 2)) || ((count + len) > max_count)) { - /* Ran out of buffer. Set dir back to old position and return = */ + if (len < 0) { v9fs_co_seekdir(pdu, fidp, saved_dir_pos); v9fs_stat_free(&v9stat); v9fs_path_free(&path); - return count; + return len; } count +=3D len; v9fs_stat_free(&v9stat); --=20 2.1.4