Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08d4f772 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Al Viro
Browse files

dcache: fix kmemcheck warning in switch_names 



This patch fixes kmemcheck warning in switch_names. The function
switch_names swaps inline names of two dentries. It swaps full arrays
d_iname, no matter how many bytes are really used by the strings. Reading
data beyond string ends results in kmemcheck warning.

We fix the bug by marking both arrays as fully initialized.

Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Cc: stable@vger.kernel.org # v3.15
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 9f45f5bf

fs/dcache.c

+2 −0
Original line number Diff line number Diff line
@@ -2360,6 +2360,8 @@ static void swap_names(struct dentry *dentry, struct dentry *target) 
			 */

			unsigned int i;

			BUILD_BUG_ON(!IS_ALIGNED(DNAME_INLINE_LEN, sizeof(long)));

			kmemcheck_mark_initialized(dentry->d_iname, DNAME_INLINE_LEN);

			kmemcheck_mark_initialized(target->d_iname, DNAME_INLINE_LEN);

			for (i = 0; i < DNAME_INLINE_LEN / sizeof(long); i++) {

				swap(((long *) &dentry->d_iname)[i],

				     ((long *) &target->d_iname)[i]);