From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-2.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_CSS,URIBL_CSS_A shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 8C2C51F601 for ; Wed, 10 Aug 2022 21:35:42 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (1024-bit key; unprotected) header.d=pobox.com header.i=@pobox.com header.b="PkEmKfZO"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231508AbiHJVfj (ORCPT ); Wed, 10 Aug 2022 17:35:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230209AbiHJVfi (ORCPT ); Wed, 10 Aug 2022 17:35:38 -0400 Received: from pb-smtp21.pobox.com (pb-smtp21.pobox.com [173.228.157.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D63FC1B7B4 for ; Wed, 10 Aug 2022 14:35:37 -0700 (PDT) Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 642511B64C2; Wed, 10 Aug 2022 17:35:37 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=7gDqXr2RW3PHeo+i6Qkc0jhAhAVSgOhyqOh1O1 Op3RQ=; b=PkEmKfZOtEu8weALwOmEfeCz4er7rjJJ4c6Cc7eGjJKoFMNWSN9ibf +cBhAnKnLW7tpUIeU9MImUqYNjdVlm8Ru93EL549Az60/SbxkUfEGv8whou2nCL2 iPjLhkp52oUjKf6L8ZvXut+X0LjLXxuaAJsdaNijDfq119vMxgfSA= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 5CB181B64C1; Wed, 10 Aug 2022 17:35:37 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.145.39.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id 043521B64B8; Wed, 10 Aug 2022 17:35:34 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: Jeff King Cc: Xavier Morel , git@vger.kernel.org Subject: Re: [PATCH 2/3] fsck: actually detect bad file modes in trees References: Date: Wed, 10 Aug 2022 14:35:32 -0700 In-Reply-To: (Jeff King's message of "Wed, 10 Aug 2022 17:02:45 -0400") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: 5DA1BA5E-18F4-11ED-8399-CBA7845BAAA9-77302942!pb-smtp21.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Jeff King writes: > We use the normal tree_desc code to iterate over trees in fsck, meaning > we only see the canonicalized modes it returns. And hence we'd never see > anything unexpected, since it will coerce literally any garbage into one > of our normal and accepted modes. Wow. I did know canon_mode() deliberately discarding the extra permission bits on trees and blobs, but it was that bad to mark whatever it does not understand as a gitlink. That is simply horrible. > - if (init_tree_desc_gently(&desc, buffer, size, 0)) { > + if (init_tree_desc_gently(&desc, buffer, size, TREE_DESC_RAW_MODES)) { > retval += report(options, tree_oid, OBJ_TREE, > FSCK_MSG_BAD_TREE, > "cannot be parsed as a tree"); OK, so we'll let desc.entry.mode carry whatever bogus bit pattern we got out of buffer and the downstream code already knows what to do with them. That's a clean and minimum way to do this. Thanks. > diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh > index ab7f31f1dc..53c2aa10b7 100755 > --- a/t/t1450-fsck.sh > +++ b/t/t1450-fsck.sh > @@ -364,6 +364,20 @@ test_expect_success 'tree entry with type mismatch' ' > test_i18ngrep ! "dangling blob" out > ' > > +test_expect_success 'tree entry with bogus mode' ' > + test_when_finished "remove_object \$blob" && > + test_when_finished "remove_object \$tree" && > + blob=$(echo blob | git hash-object -w --stdin) && > + blob_oct=$(echo $blob | hex2oct) && > + tree=$(printf "100000 foo\0${blob_oct}" | > + git hash-object -t tree --stdin -w --literally) && > + git fsck 2>err && > + cat >expect <<-EOF && > + warning in tree $tree: badFilemode: contains bad file modes > + EOF > + test_cmp expect err > +' > + > test_expect_success 'tag pointing to nonexistent' ' > badoid=$(test_oid deadbeef) && > cat >invalid-tag <<-EOF &&