mirror of
https://github.com/torvalds/linux.git
synced 2024-11-25 13:41:51 +00:00
d67790ddf0
While struct_size() is normally used in situations where the structure
type already has a pointer instance, there are places where no variable
is available. In the past, this has been worked around by using a typed
NULL first argument, but this is a bit ugly. Add a helper to do this,
and replace the handful of instances of the code pattern with it.
Instances were found with this Coccinelle script:
@struct_size_t@
identifier STRUCT, MEMBER;
expression COUNT;
@@
- struct_size((struct STRUCT *)\(0\|NULL\),
+ struct_size_t(struct STRUCT,
MEMBER, COUNT)
Suggested-by: Christoph Hellwig <hch@infradead.org>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: James Smart <james.smart@broadcom.com>
Cc: Keith Busch <kbusch@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: HighPoint Linux Team <linux@highpoint-tech.com>
Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Kashyap Desai <kashyap.desai@broadcom.com>
Cc: Sumit Saxena <sumit.saxena@broadcom.com>
Cc: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>
Cc: Don Brace <don.brace@microchip.com>
Cc: "Darrick J. Wong" <djwong@kernel.org>
Cc: Dave Chinner <dchinner@redhat.com>
Cc: Guo Xuenan <guoxuenan@huawei.com>
Cc: Gwan-gyeong Mun <gwan-gyeong.mun@intel.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Daniel Latypov <dlatypov@google.com>
Cc: kernel test robot <lkp@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Cc: linux-nvme@lists.infradead.org
Cc: linux-scsi@vger.kernel.org
Cc: megaraidlinux.pdl@broadcom.com
Cc: storagedev@microchip.com
Cc: linux-xfs@vger.kernel.org
Cc: linux-hardening@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com>
Link: https://lore.kernel.org/r/20230522211810.never.421-kees@kernel.org
71 lines
1.9 KiB
C
71 lines
1.9 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* Copyright (C) 2017-2023 Oracle. All Rights Reserved.
|
|
* Author: Darrick J. Wong <djwong@kernel.org>
|
|
*/
|
|
#ifndef __XFS_SCRUB_BTREE_H__
|
|
#define __XFS_SCRUB_BTREE_H__
|
|
|
|
/* btree scrub */
|
|
|
|
/* Check for btree operation errors. */
|
|
bool xchk_btree_process_error(struct xfs_scrub *sc,
|
|
struct xfs_btree_cur *cur, int level, int *error);
|
|
|
|
/* Check for btree xref operation errors. */
|
|
bool xchk_btree_xref_process_error(struct xfs_scrub *sc,
|
|
struct xfs_btree_cur *cur, int level, int *error);
|
|
|
|
/* Check for btree corruption. */
|
|
void xchk_btree_set_corrupt(struct xfs_scrub *sc,
|
|
struct xfs_btree_cur *cur, int level);
|
|
void xchk_btree_set_preen(struct xfs_scrub *sc, struct xfs_btree_cur *cur,
|
|
int level);
|
|
|
|
/* Check for btree xref discrepancies. */
|
|
void xchk_btree_xref_set_corrupt(struct xfs_scrub *sc,
|
|
struct xfs_btree_cur *cur, int level);
|
|
|
|
struct xchk_btree;
|
|
typedef int (*xchk_btree_rec_fn)(
|
|
struct xchk_btree *bs,
|
|
const union xfs_btree_rec *rec);
|
|
|
|
struct xchk_btree_key {
|
|
union xfs_btree_key key;
|
|
bool valid;
|
|
};
|
|
|
|
struct xchk_btree {
|
|
/* caller-provided scrub state */
|
|
struct xfs_scrub *sc;
|
|
struct xfs_btree_cur *cur;
|
|
xchk_btree_rec_fn scrub_rec;
|
|
const struct xfs_owner_info *oinfo;
|
|
void *private;
|
|
|
|
/* internal scrub state */
|
|
bool lastrec_valid;
|
|
union xfs_btree_rec lastrec;
|
|
struct list_head to_check;
|
|
|
|
/* this element must come last! */
|
|
struct xchk_btree_key lastkey[];
|
|
};
|
|
|
|
/*
|
|
* Calculate the size of a xchk_btree structure. There are nlevels-1 slots for
|
|
* keys because we track leaf records separately in lastrec.
|
|
*/
|
|
static inline size_t
|
|
xchk_btree_sizeof(unsigned int nlevels)
|
|
{
|
|
return struct_size_t(struct xchk_btree, lastkey, nlevels - 1);
|
|
}
|
|
|
|
int xchk_btree(struct xfs_scrub *sc, struct xfs_btree_cur *cur,
|
|
xchk_btree_rec_fn scrub_fn, const struct xfs_owner_info *oinfo,
|
|
void *private);
|
|
|
|
#endif /* __XFS_SCRUB_BTREE_H__ */
|