ELF uapi: add spaces before '{'

Commit Message

Rolf Eike Beer Oct. 4, 2022, 10:25 a.m. UTC

When searching for a struct definition I often enough end up simply doing

  git grep 'struct foobar {'

Sadly some of the ELF structs did not follow the usual coding style so they
were invisible.

Signed-off-by: Rolf Eike Beer <[e-mail]>
---
 include/uapi/linux/elf.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Kees Cook Oct. 6, 2022, 3:33 a.m. UTC | #1

On Tue, Oct 04, 2022 at 12:25:40PM +0200, Rolf Eike Beer wrote:
> When searching for a struct definition I often enough end up simply doing
> 
>   git grep 'struct foobar {'
> 
> Sadly some of the ELF structs did not follow the usual coding style so they
> were invisible.

Thanks! Yes, I do the same. :)

I'll get this into -next after the merge window closes.

-Kees

Kees Cook Oct. 18, 2022, 7:22 a.m. UTC | #2

On Tue, 04 Oct 2022 12:25:40 +0200, Rolf Eike Beer wrote:
> When searching for a struct definition I often enough end up simply doing
> 
>   git grep 'struct foobar {'
> 
> Sadly some of the ELF structs did not follow the usual coding style so they
> were invisible.
> 
> [...]

Applied to for-next/execve, thanks!

[1/1] ELF uapi: add spaces before '{'
      https://git.kernel.org/kees/c/5ce85ed9d20e

Patch

diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
index c7b056af9ef0..775a17b5b8ac 100644
--- a/include/uapi/linux/elf.h
+++ b/include/uapi/linux/elf.h
@@ -140,9 +140,9 @@  typedef __s64	Elf64_Sxword;
 #define ELF64_ST_BIND(x)	ELF_ST_BIND(x)
 #define ELF64_ST_TYPE(x)	ELF_ST_TYPE(x)
 
-typedef struct dynamic{
+typedef struct dynamic {
   Elf32_Sword d_tag;
-  union{
+  union {
     Elf32_Sword	d_val;
     Elf32_Addr	d_ptr;
   } d_un;
@@ -173,7 +173,7 @@  typedef struct elf64_rel {
   Elf64_Xword r_info;	/* index and type of relocation */
 } Elf64_Rel;
 
-typedef struct elf32_rela{
+typedef struct elf32_rela {
   Elf32_Addr	r_offset;
   Elf32_Word	r_info;
   Elf32_Sword	r_addend;
@@ -185,7 +185,7 @@  typedef struct elf64_rela {
   Elf64_Sxword r_addend;	/* Constant addend used to compute value */
 } Elf64_Rela;
 
-typedef struct elf32_sym{
+typedef struct elf32_sym {
   Elf32_Word	st_name;
   Elf32_Addr	st_value;
   Elf32_Word	st_size;
@@ -206,7 +206,7 @@  typedef struct elf64_sym {
 
 #define EI_NIDENT	16
 
-typedef struct elf32_hdr{
+typedef struct elf32_hdr {
   unsigned char	e_ident[EI_NIDENT];
   Elf32_Half	e_type;
   Elf32_Half	e_machine;
@@ -246,7 +246,7 @@  typedef struct elf64_hdr {
 #define PF_W		0x2
 #define PF_X		0x1
 
-typedef struct elf32_phdr{
+typedef struct elf32_phdr {
   Elf32_Word	p_type;
   Elf32_Off	p_offset;
   Elf32_Addr	p_vaddr;