Commit b3b7e1d0 authored by David Sterba's avatar David Sterba
Browse files

btrfs: add special case to setget helpers for 64k pages 

On 64K pages the size of the extent_buffer::pages array is 1 and
compilation with -Warray-bounds warns due to

  kaddr = page_address(eb->pages[idx + 1]);

when reading byte range crossing page boundary.

This does never actually overflow the array because on 64K because all
the data fit in one page and bounds are checked by check_setget_bounds.

To fix the reported overflows and warnings add a compile-time condition
that will allow compiler to eliminate the dead code that reads from the
idx + 1 page.

Link: https://lore.kernel.org/lkml/20210623083901.1d49d19d@canb.auug.org.au/


CC: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 5a80d1c6

fs/btrfs/struct-funcs.c

+4 −4
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ u##bits btrfs_get_token_##bits(struct btrfs_map_token *token, \ 
	}								\

	token->kaddr = page_address(token->eb->pages[idx]);		\

	token->offset = idx << PAGE_SHIFT;				\

	if (oip + size <= PAGE_SIZE)					\

	if (INLINE_EXTENT_BUFFER_PAGES == 1 || oip + size <= PAGE_SIZE ) \

		return get_unaligned_le##bits(token->kaddr + oip);	\

									\

	memcpy(lebytes, token->kaddr + oip, part);			\
@@ -94,7 +94,7 @@ u##bits btrfs_get_##bits(const struct extent_buffer *eb, \ 
	u8 lebytes[sizeof(u##bits)];					\

									\

	ASSERT(check_setget_bounds(eb, ptr, off, size));		\

	if (oip + size <= PAGE_SIZE)					\

	if (INLINE_EXTENT_BUFFER_PAGES == 1 || oip + size <= PAGE_SIZE)	\

		return get_unaligned_le##bits(kaddr + oip);		\

									\

	memcpy(lebytes, kaddr + oip, part);				\
@@ -124,7 +124,7 @@ void btrfs_set_token_##bits(struct btrfs_map_token *token, \ 
	}								\

	token->kaddr = page_address(token->eb->pages[idx]);		\

	token->offset = idx << PAGE_SHIFT;				\

	if (oip + size <= PAGE_SIZE) {					\

	if (INLINE_EXTENT_BUFFER_PAGES == 1 || oip + size <= PAGE_SIZE) { \

		put_unaligned_le##bits(val, token->kaddr + oip);	\

		return;							\

	}								\
@@ -146,7 +146,7 @@ void btrfs_set_##bits(const struct extent_buffer *eb, void *ptr, \ 
	u8 lebytes[sizeof(u##bits)];					\

									\

	ASSERT(check_setget_bounds(eb, ptr, off, size));		\

	if (oip + size <= PAGE_SIZE) {					\

	if (INLINE_EXTENT_BUFFER_PAGES == 1 || oip + size <= PAGE_SIZE) { \

		put_unaligned_le##bits(val, kaddr + oip);		\

		return;							\

	}								\