From patchwork Fri Oct 30 13:41:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gerard Koskamp X-Patchwork-Id: 1391055 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nedap.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nedap.com header.i=@nedap.com header.a=rsa-sha256 header.s=selector2 header.b=wj8fpkBE; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CN3z76DwLz9sTf for ; Sat, 31 Oct 2020 01:07:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AA69382531; Fri, 30 Oct 2020 15:07:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nedap.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nedap.com header.i=@nedap.com header.b="wj8fpkBE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C66C882536; Fri, 30 Oct 2020 14:42:05 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on070d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::70d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7E98882520 for ; Fri, 30 Oct 2020 14:42:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nedap.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gerard.koskamp@nedap.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pz+dxQolCWf8l7Kl6toQr38K7+6ZeucdcR3O0xIyEP7tg4SLNaJTGL/t6zFnPtGBc4t4WvWNepLMD7pyQoe7am2jAH0F9/gWzFYfzkQPqqNXBAsKdSajFUGEPbeLr4aFqCzZEeU9FMXCTC8pgW4POSSCj0mTqEzkDW/KMPcecMqiTwOqQqPu6b4IWdLnThX0Y9VHuIY9Gq+OGKYx67Vdh/xpXKARINTGIj5vZYDnpu1+WraKg/b0jZA2xkaQ02rQar9UPaiheYYyfyFKKXjVVBnsNrHHRSVYBKHEu6d4tXehaNWIZvi33FvBQAIlfccWHTHwGISX6+058t+431arzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iwIrrcJepv/SHrhpQalyLDRoMiym0b/N2PRnAAo4CUY=; b=UsklXJcaZHMGtLlC73Q8GorMHCSvnGHLDDpuPMhT9pbMwH8LVf9h5CJ+CrTCFRDBvs2zZjx/M/3owiONu/kJhZcfAkBrUR5LtK0eHU1vIKxZJCjW/JN1fV+VyiAjFPKCeUwrsWhruByz1RHejn16dhPdsIFrsBo7RD3gkICXRbFajjTgJCHIVDFkK+Klx1rvlaugLGLY3fvulvMRglk60RvndSo3IcaVcjZpgFxuUIoTEWrMqqJdesmhrNNbW+C8uKVCAqKgCQPuuR+jdNBNhvvdETgbosltUcukkBa2U7vg+2AWmCsQY6QTQdD9m4IviU+olfWaRCTJYOXiqKQyGQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nedap.com; dmarc=pass action=none header.from=nedap.com; dkim=pass header.d=nedap.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nedap.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iwIrrcJepv/SHrhpQalyLDRoMiym0b/N2PRnAAo4CUY=; b=wj8fpkBE31QYV1XJAZLGh1XLS4ymJZQupayBVuvTEW5FQnhBX0fSZsDHUbUrbhefZAYKhtxjiaIQvv//EKFsTpfY2on8K/0UEEwBulPt0A2ly8X1LOcPewetnOo6LuRRA9I9u87W0mU0VNwRczB7w1dSlhEN07xeGld9vGp88jU= Received: from AM0PR10MB2385.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:da::23) by AM0PR10MB2769.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:133::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19; Fri, 30 Oct 2020 13:41:58 +0000 Received: from AM0PR10MB2385.EURPRD10.PROD.OUTLOOK.COM ([fe80::110e:e758:2254:17e4]) by AM0PR10MB2385.EURPRD10.PROD.OUTLOOK.COM ([fe80::110e:e758:2254:17e4%7]) with mapi id 15.20.3477.029; Fri, 30 Oct 2020 13:41:58 +0000 From: Gerard Koskamp To: "u-boot@lists.denx.de" CC: "joaomarcos.costa@bootlin.com" Subject: [PATCH] fs/squashfs: Fix index off by 1 for inode SQFS_LDIR_TYPE Thread-Topic: [PATCH] fs/squashfs: Fix index off by 1 for inode SQFS_LDIR_TYPE Thread-Index: AQHWrsJwyhw7K3GBk0ajfw76CEDrlw== Date: Fri, 30 Oct 2020 13:41:58 +0000 Message-ID: <1604065318.29320.6.camel@nedap.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Evolution 3.18.5.2-0ubuntu3.2 authentication-results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nedap.com; x-originating-ip: [2001:980:9118:1:76ad:c7a7:8896:99a8] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1228d22d-40a8-4515-4585-08d87cd992e1 x-ms-traffictypediagnostic: AM0PR10MB2769: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:304; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: k8jqXLiCuxIFFjt/cMytRtzviG893P/ap7Lcraw4u5Vl2UISVRyfwT8NDWNvEPK1OIX6t42T6Y/r5ID1zZG/fdJC4PxwGEKrKqng2cI23p9kyRp5Uo4eUNcwiqs+e7UjeipzvAOFpgOy/vzQJsSCMRYWF8uUCJeQuJQLCYIzQipGR2FDJ4aefbJEIwT2QLe55ugGHVEzX0GgvDrTgBoFgmOt7WYof1E4bAIJkgcFr+mJO9peKxZEc63yXxzVxQvcJAFwk9pSFzew/JVV1JME9c2sEl5jrlaVBzX7euhrYV5Y85anROFikPM2Mzxk6K8NaEsrjTODQJ44WkROqRQPS15yATcWCyUg5rtlW10v7AaDBLcfe768ymtEOMYjjN7Q2vfpDDr8uazIZ92vz5LoLei/LMEQ4ND0KCD7RQgm1T3xtDNibcz09ZVkYxRKEo6GpuVXjCrXTstvBP4kxrAzHg== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR10MB2385.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(366004)(346002)(376002)(39850400004)(136003)(396003)(66476007)(66556008)(2616005)(71200400001)(64756008)(103116003)(6512007)(8676002)(36756003)(86362001)(966005)(186003)(44832011)(6916009)(5660300002)(83380400001)(316002)(76116006)(478600001)(66446008)(4326008)(6506007)(6486002)(8936002)(2906002)(66946007)(99106002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: rYCmbS9VkaTRrou231X+YXu2Iw1Cf+DNVmDDwqJIAZ+KgfBjwNsYn7mXEUwONFFX6lrGVGJWHQf+lZzTIx5usrBh4PSD6W9wkKLHzE+l0RdyWQZQnKNH1HejBji8qxn7SG1swxj6Q+/F0z8K5HR0DxQ8iw8MxZo98jbDUgLNY+OQIQ2koc7TMEtumAFX7ppVNiqeN6mtsppZAw+kzAD9DxxdFktHpDfENsn8dNlJh2ir9O45CHagTX0pw5C24pQa1g5uHrjBf3atdaZ/6lql13PopYZo1aisqLPmhBN9Q7fde6nksaY6XHejq15zYpDwTChlFkFhYUGJfCxVksS9nTWV+JpCqxeriJA/y15SiIVUSsF5yiCTElpQeKJjsIkiKjM8jPwyI3FPrvJ8CkzwqJVsTfk2n//F/J5JwKE8I4H5ycEgZm5SZKcARUW+qvsk5XYaN3/yKMhBHRA4k5tXvEfF06pXwqDrp0Qzi35laQwZ9WkG2L4EuQ4XwQhY/dMZrbH3iyilvkr4GlxT1Gx/jrXuBYle0NZh20jrK8yY3yh+/7/za2KUYOAjPisXf5rQ0mqirxg9u6bMDBcyie1kMYisCDgMhNxRDOB2MmQ5Kbd7J1VnQWlxoYsEWvfH+2LM2WJKzAKG8KTUrzjxl0jth50RGV+CSGQcG+KbCGxeRjYx5W5g5QgUrR7ZcJn0ugorSmPM6OOIQ4iZHZReaRLduw== x-ms-exchange-transport-forked: True Content-ID: MIME-Version: 1.0 X-OriginatorOrg: nedap.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AM0PR10MB2385.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 1228d22d-40a8-4515-4585-08d87cd992e1 X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Oct 2020 13:41:58.5680 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 6d21d161-0ae7-4a24-94cf-df0881e2fa96 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: OdUdgh+j5PFDnQQPOX9GZP4xRDVPLvnSix0EzXgzIMNdEluv0RzZqCUSQr2NrKdJZDymLd8emRFr90RbAy0bfW9piOJnVVXU33yLVE25NI8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB2769 X-Mailman-Approved-At: Fri, 30 Oct 2020 15:07:09 +0100 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.102.3 at phobos.denx.de X-Virus-Status: Clean I've created a squashfs file system with Yocto (it use squashfs-tools) and u-boot command sqfsls give the error:'Error while searching inode: unknown type.' After some digging in the code I found that the index is off by 1. This patch fix this issue and I can successful use the sqfsls command. After search for the squashfs format I found a link talk about a similar issue but this time in the documentation. The link is: https://github.com/AgentD/squashfs-tools-ng/commit/e6588526838caece9529 Signed-off-by: Gerard Koskamp CC: Joao Marcos Costa ---  fs/squashfs/sqfs_inode.c | 4 ++--  1 file changed, 2 insertions(+), 2 deletions(-) --  2.7.4 diff --git a/fs/squashfs/sqfs_inode.c b/fs/squashfs/sqfs_inode.c index 14d70cf..0983974 100644 --- a/fs/squashfs/sqfs_inode.c +++ b/fs/squashfs/sqfs_inode.c @@ -49,7 +49,7 @@ int sqfs_inode_size(struct squashfs_base_inode *inode, u32 blk_size)   return sizeof(*ldir);     di = ldir->index; - while (l < i_count + 1) { + while (l < i_count) {   sz = get_unaligned_le32(&di->size) + 1;   index_list_size += sz;   di = (void *)di + sizeof(*di) + sz; @@ -57,7 +57,7 @@ int sqfs_inode_size(struct squashfs_base_inode *inode, u32 blk_size)   }     return sizeof(*ldir) + index_list_size + - (i_count + 1) * SQFS_DIR_INDEX_BASE_LENGTH; + i_count * SQFS_DIR_INDEX_BASE_LENGTH;   }     case SQFS_LREG_TYPE: {