Skip to content

Commit

Permalink
dm: verity-loadpin: Drop use of dm_table_get_num_targets()
Browse files Browse the repository at this point in the history
Commit 2aec377 ("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: b6c1c57 ("dm: Add verity helpers for LoadPin")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20220728085412.1.I242d21b378410eb6f9897a3160efb56e5608c59d@changeid
  • Loading branch information
Matthias Kaehlcke authored and Kees Cook committed Jul 29, 2022
1 parent aaf50b1 commit 27603a6
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/md/dm-verity-loadpin.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 27603a6

Please sign in to comment.