| Message ID | 20220728085412.1.I242d21b378410eb6f9897a3160efb56e5608c59d@changeid (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Mike Snitzer |
| Headers | show |
| Series | dm: verity-loadpin: Drop use of dm_table_get_num_targets() | expand |
Hi, On Thu, Jul 28, 2022 at 8:54 AM Matthias Kaehlcke <mka@chromium.org> wrote: > > Commit 2aec377a2925 ("dm table: remove dm_table_get_num_targets() > wrapper") in linux-dm/for-next removed the function > dm_table_get_num_targets() which is used by verity-loadpin. Access > table->num_targets directly instead of using the defunct wrapper. > > Fixes: b6c1c5745ccc ("dm: Add verity helpers for LoadPin") > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> > Signed-off-by: Matthias Kaehlcke <mka@chromium.org> > --- > > drivers/md/dm-verity-loadpin.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) FWIW: Reviewed-by: Douglas Anderson <dianders@chromium.org> -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel
On Thu, 28 Jul 2022 08:54:41 -0700, Matthias Kaehlcke wrote: > Commit 2aec377a2925 ("dm table: remove dm_table_get_num_targets() > wrapper") in linux-dm/for-next removed the function > dm_table_get_num_targets() which is used by verity-loadpin. Access > table->num_targets directly instead of using the defunct wrapper. > > Applied to for-next/hardening, thanks! [1/1] dm: verity-loadpin: Drop use of dm_table_get_num_targets() https://git.kernel.org/kees/c/27603a606fda
diff --git a/drivers/md/dm-verity-loadpin.c b/drivers/md/dm-verity-loadpin.c index 10c18bc1652c..387ec43aef72 100644 --- a/drivers/md/dm-verity-loadpin.c +++ b/drivers/md/dm-verity-loadpin.c @@ -5,6 +5,7 @@ #include <linux/dm-verity-loadpin.h> #include "dm.h" +#include "dm-core.h" #include "dm-verity.h" #define DM_MSG_PREFIX "verity-loadpin" @@ -58,7 +59,7 @@ bool dm_verity_loadpin_is_bdev_trusted(struct block_device *bdev) table = dm_get_live_table(md, &srcu_idx); - if (dm_table_get_num_targets(table) != 1) + if (table->num_targets != 1) goto out; ti = dm_table_get_target(table, 0);
Commit 2aec377a2925 ("dm table: remove dm_table_get_num_targets() wrapper") in linux-dm/for-next removed the function dm_table_get_num_targets() which is used by verity-loadpin. Access table->num_targets directly instead of using the defunct wrapper. Fixes: b6c1c5745ccc ("dm: Add verity helpers for LoadPin") Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Matthias Kaehlcke <mka@chromium.org> --- drivers/md/dm-verity-loadpin.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)