Commit c593642c authored by Pankaj Bharadiya's avatar Pankaj Bharadiya Committed by Kees Cook
Browse files

treewide: Use sizeof_field() macro 



Replace all the occurrences of FIELD_SIZEOF() with sizeof_field() except
at places where these are defined. Later patches will remove the unused
definition of FIELD_SIZEOF().

This patch is generated using following script:

EXCLUDE_FILES="include/linux/stddef.h|include/linux/kernel.h"

git grep -l -e "\bFIELD_SIZEOF\b" | while read file;
do

	if [[ "$file" =~ $EXCLUDE_FILES ]]; then
		continue
	fi
	sed -i  -e 's/\bFIELD_SIZEOF\b/sizeof_field/g' $file;
done

Signed-off-by: default avatarPankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Link: https://lore.kernel.org/r/20190924105839.110713-3-pankaj.laxminarayan.bharadiya@intel.com


Co-developed-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: David Miller <davem@davemloft.net> # for net
parent e4372329

Documentation/process/coding-style.rst

+1 −1
Original line number Diff line number Diff line
@@ -988,7 +988,7 @@ Similarly, if you need to calculate the size of some structure member, use 


.. code-block:: c



	#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))

	#define sizeof_field(t, f) (sizeof(((t*)0)->f))



There are also min() and max() macros that do strict type checking if you

need them.  Feel free to peruse that header file to see what else is already

Documentation/translations/it_IT/process/coding-style.rst

+1 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ struttura, usate 


.. code-block:: c



	#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))

	#define sizeof_field(t, f) (sizeof(((t*)0)->f))



Ci sono anche le macro min() e max() che, se vi serve, effettuano un controllo

rigido sui tipi.  Sentitevi liberi di leggere attentamente questo file

Documentation/translations/zh_CN/process/coding-style.rst

+1 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ inline gcc 也可以自动使其内联。而且其他用户可能会要求移除 


.. code-block:: c



	#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f))

	#define sizeof_field(t, f) (sizeof(((t*)0)->f))



还有可以做严格的类型检查的 min() 和 max() 宏，如果你需要可以使用它们。你可以

自己看看那个头文件里还定义了什么你可以拿来用的东西，如果有定义的话，你就不应

arch/arc/kernel/unwind.c

+3 −3
Original line number Diff line number Diff line
@@ -42,10 +42,10 @@ do { \ 


#define EXTRA_INFO(f) { \

		BUILD_BUG_ON_ZERO(offsetof(struct unwind_frame_info, f) \

				% FIELD_SIZEOF(struct unwind_frame_info, f)) \

				% sizeof_field(struct unwind_frame_info, f)) \

				+ offsetof(struct unwind_frame_info, f) \

				/ FIELD_SIZEOF(struct unwind_frame_info, f), \

				FIELD_SIZEOF(struct unwind_frame_info, f) \

				/ sizeof_field(struct unwind_frame_info, f), \

				sizeof_field(struct unwind_frame_info, f) \

	}

#define PTREGS_INFO(f) EXTRA_INFO(regs.f)

arch/powerpc/net/bpf_jit32.h

+2 −2
Original line number Diff line number Diff line
@@ -97,12 +97,12 @@ DECLARE_LOAD_FUNC(sk_load_byte_msh); 
#ifdef CONFIG_SMP

#ifdef CONFIG_PPC64

#define PPC_BPF_LOAD_CPU(r)		\

	do { BUILD_BUG_ON(FIELD_SIZEOF(struct paca_struct, paca_index) != 2);	\

	do { BUILD_BUG_ON(sizeof_field(struct paca_struct, paca_index) != 2);	\

		PPC_LHZ_OFFS(r, 13, offsetof(struct paca_struct, paca_index));	\

	} while (0)

#else

#define PPC_BPF_LOAD_CPU(r)     \

	do { BUILD_BUG_ON(FIELD_SIZEOF(struct task_struct, cpu) != 4);		\

	do { BUILD_BUG_ON(sizeof_field(struct task_struct, cpu) != 4);		\

		PPC_LHZ_OFFS(r, 2, offsetof(struct task_struct, cpu));		\

	} while(0)

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE