History

assoc_array: Fix shortcut creation

Fix the creation of shortcuts for which the length of the index key value is an exact multiple of the machine word size. The problem is that the code that blanks off the unused bits of the shortcut value malfunctions if the number of bits in the last word equals machine word size. This is due to the "<<" operator being given a shift of zero in this case, and so the mask that should be all zeros is all ones instead. This causes the subsequent masking operation to clear everything rather than clearing nothing. Ordinarily, the presence of the hash at the beginning of the tree index key makes the issue very hard to test for, but in this case, it was encountered due to a development mistake that caused the hash output to be either 0 (keyring) or 1 (non-keyring) only. This made it susceptible to the keyctl/unlink/valid test in the keyutils package. The fix is simply to skip the blanking if the shift would be 0. For example, an index key that is 64 bits long would produce a 0 shift and thus a 'blank' of all 1s. This would then be inverted and AND'd onto the index_key, incorrectly clearing the entire last word.

David Howells committed 7 years ago

Commit bb2ba2d1 parent a08bf911 file · +5 −3Browse files

Unified · Split

lib/assoc_array.c+5−3
@@ -768,9 +768,11 @@ all_leaves_cluster_together: · 767 unmodified lines
768768 new_s0->index_key[i] =
769769 ops->get_key_chunk(index_key, i * ASSOC_ARRAY_KEY_CHUNK_SIZE);
770770
771− blank = ULONG_MAX << (level & ASSOC_ARRAY_KEY_CHUNK_MASK);
772− pr_devel("blank off [%zu] %d: %lx\n", keylen - 1, level, blank);
773− new_s0->index_key[keylen - 1] &= ~blank;
771+ if (level & ASSOC_ARRAY_KEY_CHUNK_MASK) {
772+ blank = ULONG_MAX << (level & ASSOC_ARRAY_KEY_CHUNK_MASK);
773+ pr_devel("blank off [%zu] %d: %lx\n", keylen - 1, level, blank);
774+ new_s0->index_key[keylen - 1] &= ~blank;
775+ }
774776
775777 /* This now reduces to a node splitting exercise for which we'll need
776778 * to regenerate the disparity table.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t