Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace one-element array flex-array member in fs/reiserfs/reiserfs.h #290

Closed
GustavoARSilva opened this issue May 16, 2023 · 2 comments
Closed

Replace one-element array flex-array member in fs/reiserfs/reiserfs.h #290

GustavoARSilva opened this issue May 16, 2023 · 2 comments
Assignees
@GustavoARSilva
Labels
[Idiom] fake flexible array [Linux] v6.6 Released in Linux kernel v6.6 [Refactor] 1-element array Conversion away from one-element array

Comments

@GustavoARSilva
Copy link
Collaborator 

diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
index 1bccf6a2e908..65924fcdd28b 100644
--- a/fs/reiserfs/reiserfs.h
+++ b/fs/reiserfs/reiserfs.h
@@ -2374,7 +2374,7 @@ struct virtual_node {
 struct direntry_uarea {
        int flags;
        __u16 entry_count;
-       __u16 entry_sizes[1];
+       __u16 entry_sizes[];
 } __attribute__ ((__packed__));
@GustavoARSilva GustavoARSilva self-assigned this May 16, 2023
intel-lab-lkp pushed a commit to intel-lab-lkp/linux that referenced this issue Jun 21, 2023
@GustavoARSilva @intel-lab-lkp
reiserfs: Replace one-element array with flexible-array member
d743e29 
One-element arrays are deprecated, and we are replacing them with flexible
array members instead. So, replace one-element array with flexible-array
member in direntry_uarea structure, and refactor the rest of the code,
accordingly.

Worth mentioning is that before these changes, the original implementation
was returning two-too many bytes in function direntry_create_vi():

fs/reiserfs/item_ops.c:464:     int size = sizeof(struct direntry_uarea);
...
fs/reiserfs/item_ops.c-490-     size += (dir_u->entry_count * sizeof(short));
...
fs/reiserfs/item_ops.c-517-     return size;

Link: KSPP#79
Link: KSPP#290
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
@GustavoARSilva
Copy link
Collaborator Author

Patch: https://lore.kernel.org/linux-hardening/ZJN9Kqhcs0ZGET%2F8@work/

@GustavoARSilva GustavoARSilva added the [PATCH] Exists A patch exists to address the issue label Jun 22, 2023
akiyks pushed a commit to akiyks/linux that referenced this issue Jul 13, 2023
@GustavoARSilva
reiserfs: Replace one-element array with flexible-array member
76d2ced 
One-element arrays are deprecated, and we are replacing them with flexible
array members instead. So, replace one-element array with flexible-array
member in direntry_uarea structure, and refactor the rest of the code,
accordingly.

Worth mentioning is that before these changes, the original implementation
was returning two-too many bytes in function direntry_create_vi():

fs/reiserfs/item_ops.c:464:     int size = sizeof(struct direntry_uarea);
...
fs/reiserfs/item_ops.c-490-     size += (dir_u->entry_count * sizeof(short));
...
fs/reiserfs/item_ops.c-517-     return size;

Link: KSPP#79
Link: KSPP#290
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
arinc9 pushed a commit to arinc9/linux that referenced this issue Jul 29, 2023
@GustavoARSilva @arinc9
reiserfs: Replace one-element array with flexible-array member
252cedc 
One-element arrays are deprecated, and we are replacing them with flexible
array members instead. So, replace one-element array with flexible-array
member in direntry_uarea structure, and refactor the rest of the code,
accordingly.

Worth mentioning is that before these changes, the original implementation
was returning two-too many bytes in function direntry_create_vi():

fs/reiserfs/item_ops.c:464:     int size = sizeof(struct direntry_uarea);
...
fs/reiserfs/item_ops.c-490-     size += (dir_u->entry_count * sizeof(short));
...
fs/reiserfs/item_ops.c-517-     return size;

Link: KSPP#79
Link: KSPP#290
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
@kees kees added [Linux] v6.6 Released in Linux kernel v6.6 and removed [PATCH] Exists A patch exists to address the issue labels Feb 6, 2024
@kees
Copy link

kees commented Feb 6, 2024

Fixed in commit 76d2ced.

@kees kees closed this as completed Feb 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@GustavoARSilva GustavoARSilva

Labels
[Idiom] fake flexible array [Linux] v6.6 Released in Linux kernel v6.6 [Refactor] 1-element array Conversion away from one-element array
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@GustavoARSilva @kees