From patchwork Sat Oct 16 02:19:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jincheng Wang X-Patchwork-Id: 1542015 X-Patchwork-Delegate: trini@ti.com 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" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=IlMcgFkK; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HWRgQ0nWBz9sRR for ; Sat, 16 Oct 2021 13:20:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B429383657; Sat, 16 Oct 2021 04:20:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IlMcgFkK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DFCF983694; Sat, 16 Oct 2021 04:20:03 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,HTML_MESSAGE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 732628361E for ; Sat, 16 Oct 2021 04:20:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jc.w4ng@gmail.com Received: by mail-qk1-x744.google.com with SMTP id a13so489610qkg.11 for ; Fri, 15 Oct 2021 19:20:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to:cc; bh=LsTF2nmvq39QA604DeotUf1Brp+S5SSHsGxF8My0O7I=; b=IlMcgFkKTHlm8KOQSlQJnUyWirFnyatj1C07hBk0XdKBL0o43SBGr1nf4AU0k4prQ7 vZAqyk7rD9/dwPNjtAKuZ+p7m69YBLZclLS/gde/Er+eO4dw+z7ObHcPywbOUcj3ZCkf ec9Df+17qKgekGiSSf12gKn4bRX/QChRD/q0aoQ/YZwgM+ndFT7OtBJHRoPqkbJHX3vr QNmxzZdj/r+q4dR8FJ8TZLfEZ6Mdj057rNJlOhmkwu1LMbFSnlHisygtm2ldfS850Doq RfRQgD+2MdSa+cW85JL3M7xt4rKkICLheTLoRYc/3tC63LJYdqrG8kAURrlsZgMt81Q7 GTxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=LsTF2nmvq39QA604DeotUf1Brp+S5SSHsGxF8My0O7I=; b=3XRh+DIx8nAndPBBaOsFnsFK8xKYw+P8yyJyvtIQTtlzgiZT390v5u8SYeQJQPK+HF IIlwROrZJT+lNpDfp19noyPVScdTR02z/t0V+grw5xngHixcG5f++LGEeqoOGOy6vPQT qnfLrviIzIH8FwykoQII34WIz+35udsniWLM1zcWl9WdYOhHh/9nMF/awxTxrbWfoeJM Lpd3mCD9/PUCdyCSjvOyGomOqxsbYCy1Ze/opxuBkGkIafaYBE9gfH/elp4mQBmspz70 tIlu6qbUZfU7SbxahyLAg660/zXes16bqXc6uGeAKNVl1Vf8o4RqI8WKoZD/RcjycLmi tAzg== X-Gm-Message-State: AOAM533AX55jmhNbFbxGefIuKuCGOuvlawZaxxN4A6MzClM6x+C3/3lG qeLE0B1mI6uk1FIolfuXKT+CUvqXes3biIJm6dk= X-Google-Smtp-Source: ABdhPJztCR6jVgRRL4C7t905Ttyh1eYupCfKhGd1xn6J9xi1ZOOhU8HCtaFahyTJvYMJusGRQhb5ShBYqk1/Pq837O0= X-Received: by 2002:a37:ecb:: with SMTP id 194mr12942101qko.254.1634350799027; Fri, 15 Oct 2021 19:19:59 -0700 (PDT) MIME-Version: 1.0 From: Jincheng Wang Date: Sat, 16 Oct 2021 10:19:48 +0800 Message-ID: Subject: [PATCH1/1]sqfs: sqfs_tokenize() should fill the tokens list instead of free items To: Tom Rini Cc: u-boot@lists.denx.de X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean We can delete two lines of code to avoid double free bug, but still a wild pointers bug. A test for wild pointers: sqfsls host 0 1//2/3//4/5 Fill the tokens list can solve it well. Signed-off-by: Jincheng Wang --- fs/squashfs/sqfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) } diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c index e2d91c654c..50d3f8b71e 100644 --- a/fs/squashfs/sqfs.c +++ b/fs/squashfs/sqfs.c @@ -303,8 +303,9 @@ static int sqfs_tokenize(char **tokens, int count, const char *str) aux = strtok(!j ? strc : NULL, "/"); tokens[j] = strdup(aux); if (!tokens[j]) { - for (i = 0; i < j; i++) - free(tokens[i]); + /* fill tokens list to avoid wild pointers being freed*/ + for (i = j + 1; i < count; i++) + tokens[i] = 0; ret = -ENOMEM; goto free_strc;