attr: fix integer overflow with more than INT_MAX macros

Attributes have a field that tracks the position in the `all_attrs` array they're stored inside. This field gets set via `hashmap_get_size` when adding the attribute to the global map of attributes. But while the field is of type `int`, the value returned by `hashmap_get_size` is an `unsigned int`. It can thus happen that the value overflows, where we would now dereference teh `all_attrs` array at an out-of-bounds value. We do have a sanity check for this overflow via an assert that verifies the index matches the new hashmap's size. But asserts are not a proper mechanism to detect against any such overflows as they may not in fact be compiled into production code. Fix this by using an `unsigned int` to track the index and convert the assert to a call `die()`. Reported-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Patrick Steinhardt committed Dec 1, 2022 at 15:45 UTC e1e12e97ac73ded85f7d000da1063a774b3cc14f
1 file changed +5 -5
attr.c
+5 -5
@@ -28,7 +28,7 @@ static const char git_attr__unknown[] = "(builtin)unknown";
28 #endif
29
30 struct git_attr {
31 - int attr_nr; /* unique attribute number */
31 + unsigned int attr_nr; /* unique attribute number */
32 char name[FLEX_ARRAY]; /* attribute name */
33 };
34
@@ -226,8 +226,8 @@ static const struct git_attr *git_attr_internal(const char *name, size_t namelen
226 a->attr_nr = hashmap_get_size(&g_attr_hashmap.map);
227
228 attr_hashmap_add(&g_attr_hashmap, a->name, namelen, a);
229 - assert(a->attr_nr ==
230 - (hashmap_get_size(&g_attr_hashmap.map) - 1));
229 + if (a->attr_nr != hashmap_get_size(&g_attr_hashmap.map) - 1)
230 + die(_("unable to add additional attribute"));
231 }
232
233 hashmap_unlock(&g_attr_hashmap);
@@ -1064,7 +1064,7 @@ static void determine_macros(struct all_attrs_item *all_attrs,
1064 for (i = stack->num_matches; i > 0; i--) {
1065 const struct match_attr *ma = stack->attrs[i - 1];
1066 if (ma->is_macro) {
1067 - int n = ma->u.attr->attr_nr;
1067 + unsigned int n = ma->u.attr->attr_nr;
1068 if (!all_attrs[n].macro) {
1069 all_attrs[n].macro = ma;
1070 }
@@ -1116,7 +1116,7 @@ void git_check_attr(const struct index_state *istate,
1116 collect_some_attrs(istate, path, check);
1117
1118 for (i = 0; i < check->nr; i++) {
1119 - size_t n = check->items[i].attr->attr_nr;
1119 + unsigned int n = check->items[i].attr->attr_nr;
1120 const char *value = check->all_attrs[n].value;
1121 if (value == ATTR__UNKNOWN)
1122 value = ATTR__UNSET;