git, branch v2.33.6Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.33.62022-12-13T12:13:48ZGit 2.33.62022-12-13T12:13:48ZJunio C Hamanogitster@pobox.com2022-12-13T12:13:48Zurn:sha1:7fe9bf55b84d2610a7ac09893b25ef188f145a21
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sync with Git 2.32.52022-12-13T12:13:11ZJunio C Hamanogitster@pobox.com2022-12-13T12:13:11Zurn:sha1:5f22dcc02df6e69145489c8bec6872e9452688b8Git 2.32.52022-12-13T12:10:27ZJunio C Hamanogitster@pobox.com2022-12-13T12:10:27Zurn:sha1:d96ea538e8dd0fcf381089a3b09c0a9af3617351
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Merge branch 'ps/attr-limits-with-fsck' into maint-2.322022-12-13T12:09:56ZJunio C Hamanogitster@pobox.com2022-12-13T12:09:56Zurn:sha1:32e357b6df4c686151d371da7c3ff56444227d9eSync with Git 2.31.62022-12-13T12:09:40ZJunio C Hamanogitster@pobox.com2022-12-13T12:09:40Zurn:sha1:8a755eddf5bf256613bc584f32cd44401a25897cGit 2.31.62022-12-13T12:04:03ZJunio C Hamanogitster@pobox.com2022-12-13T12:04:03Zurn:sha1:82689d5e5d3f41da2ab1fbf9fbe7aacfd6da74c1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sync with Git 2.30.72022-12-13T12:02:20ZJunio C Hamanogitster@pobox.com2022-12-13T12:02:20Zurn:sha1:16128765d70f1375bcde3f27f51f85492b176a59Git 2.30.72022-12-13T11:56:43ZJunio C Hamanogitster@pobox.com2022-12-13T11:56:43Zurn:sha1:b7b37a33711e64bf580ef3141878b12a36e28833
Signed-off-by: Junio C Hamano <gitster@pobox.com>
fsck: implement checks for gitattributes2022-12-09T08:07:04ZPatrick Steinhardtps@pks.im2022-12-01T14:46:09Zurn:sha1:27ab4784d5c9e24345b9f5b443609cbe527c51f9
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 <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
fsck: move checks for gitattributes2022-12-09T08:05:00ZPatrick Steinhardtps@pks.im2022-12-01T14:46:05Zurn:sha1:f8587c31c96172aac547f83977c98fa8f0e2aa67
Move the checks for gitattributes so that they can be extended more
readily.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>