On Thu, 2019-10-10 at 16:23 -0700, Kees Cook wrote: > From: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@xxxxxxxxx> > > Replace all the occurrences of FIELD_SIZEOF() and sizeof_field() with > sizeof_member() except at places where these are defined. Later patches > will remove the unused definitions. > > This patch is generated using following script: > > EXCLUDE_FILES="include/linux/stddef.h|include/linux/kernel.h" > > git grep -l -e "\bFIELD_SIZEOF\b" -e "\bsizeof_field\b" | while read file; > do > > if [[ "$file" =~ $EXCLUDE_FILES ]]; then > continue > fi > sed -i -e 's/\bFIELD_SIZEOF\b/sizeof_member/g' \ > -e 's/\bsizeof_field\b/sizeof_member/g' \ > $file; > done While the sed works, a cocci script would perhaps be better as multi line argument realignment would also occur. $ cat sizeof_member.cocci @@ @@ - FIELD_SIZEOF + sizeof_member @@ @@ - sizeof_field + sizeof_member $ For instance, this sed produces: diff --git a/crypto/adiantum.c b/crypto/adiantum.c @@ -435,10 +435,10 @@ static int adiantum_init_tfm(struct crypto_skcipher *tfm) BUILD_BUG_ON(offsetofend(struct adiantum_request_ctx, u) != sizeof(struct adiantum_request_ctx)); - subreq_size = max(FIELD_SIZEOF(struct adiantum_request_ctx, + subreq_size = max(sizeof_member(struct adiantum_request_ctx, u.hash_desc) + crypto_shash_descsize(hash), - FIELD_SIZEOF(struct adiantum_request_ctx, + sizeof_member(struct adiantum_request_ctx, u.streamcipher_req) + crypto_skcipher_reqsize(streamcipher)); where the cocci script produces: --- crypto/adiantum.c +++ /tmp/cocci-output-22881-d8186c-adiantum.c @@ -435,11 +435,11 @@ static int adiantum_init_tfm(struct cryp BUILD_BUG_ON(offsetofend(struct adiantum_request_ctx, u) != sizeof(struct adiantum_request_ctx)); - subreq_size = max(FIELD_SIZEOF(struct adiantum_request_ctx, - u.hash_desc) + + subreq_size = max(sizeof_member(struct adiantum_request_ctx, + u.hash_desc) + crypto_shash_descsize(hash), - FIELD_SIZEOF(struct adiantum_request_ctx, - u.streamcipher_req) + + sizeof_member(struct adiantum_request_ctx, + u.streamcipher_req) + crypto_skcipher_reqsize(streamcipher)); crypto_skcipher_set_reqsize(tfm,
