git, branch v2.32.5

Git 2.32.5

2022-12-13T12:10:27Z

Signed-off-by: Junio C Hamano

Merge branch 'ps/attr-limits-with-fsck' into maint-2.32

2022-12-13T12:09:56Z

Sync with Git 2.31.6

2022-12-13T12:09:40Z

Git 2.31.6

2022-12-13T12:04:03Z

Signed-off-by: Junio C Hamano

Sync with Git 2.30.7

2022-12-13T12:02:20Z

Git 2.30.7

2022-12-13T11:56:43Z

Signed-off-by: Junio C Hamano

fsck: implement checks for gitattributes

2022-12-09T08:07:04Z

Recently, a vulnerability was reported that can lead to an out-of-bounds write when reading an unreasonably large gitattributes file. The root cause of this error are multiple integer overflows in different parts of the code when there are either too many lines, when paths are too long, when attribute names are too long, or when there are too many attributes declared for a pattern. As all of these are related to size, it seems reasonable to restrict the size of the gitattributes file via git-fsck(1). This allows us to both stop distributing known-vulnerable objects via common hosting platforms that have fsck enabled, and users to protect themselves by enabling the `fetch.fsckObjects` config. There are basically two checks: 1. We verify that size of the gitattributes file is smaller than 100MB. 2. We verify that the maximum line length does not exceed 2048 bytes. With the preceding commits, both of these conditions would cause us to either ignore the complete gitattributes file or blob in the first case, or the specific line in the second case. Now with these consistency checks added, we also grow the ability to stop distributing such files in the first place when `receive.fsckObjects` is enabled. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano

fsck: move checks for gitattributes

2022-12-09T08:05:00Z

Move the checks for gitattributes so that they can be extended more readily. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano

fsck: pull out function to check a set of blobs

2022-12-09T08:05:00Z

In `fsck_finish()` we check all blobs for consistency that we have found during the tree walk, but that haven't yet been checked. This is only required for gitmodules right now, but will also be required for a new check for gitattributes. Pull out a function `fsck_blobs()` that allows the caller to check a set of blobs for consistency. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano

fsck: refactor `fsck_blob()` to allow for more checks

2022-12-09T08:05:00Z

In general, we don't need to validate blob contents as they are opaque blobs about whose content Git doesn't need to care about. There are some exceptions though when blobs are linked into trees so that they would be interpreted by Git. We only have a single such check right now though, which is the one for gitmodules that has been added in the context of CVE-2018-11235. Now we have found another vulnerability with gitattributes that can lead to out-of-bounds writes and reads. So let's refactor `fsck_blob()` so that it is more extensible and can check different types of blobs. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano