iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'gcc-plugins-v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Browse Source 
Pull gcc-plugins fix from Kees Cook:
 "Fix a potential problem in randomize_layout structure auto-selection
  (that was not triggered by any existing kernel structures)"

* tag 'gcc-plugins-v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  randstruct: Check member structs in is_pure_ops_struct()
This commit is contained in:
Linus Torvalds
2019-09-21 09:36:28 -07:00
parent 56c1e83434 60f2c82ed2
commit 56c631f5ae
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/gcc-plugins/randomize_layout_plugin.c
View File

@ -443,13 +443,13 @@ static int is_pure_ops_struct(const_tree node)
if (node == fieldtype)
continue;
if (!is_fptr(fieldtype))
return 0;
if (code != RECORD_TYPE && code != UNION_TYPE)
if (code == RECORD_TYPE || code == UNION_TYPE) {
if (!is_pure_ops_struct(fieldtype))
return 0;
continue;
}
if (!is_pure_ops_struct(fieldtype))
if (!is_fptr(fieldtype))
return 0;
}