Commit 70fe6081 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Luis Henriques

dcache: fix kmemcheck warning in switch_names

commit 08d4f772 upstream.

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>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent f707a1ca
...@@ -2436,6 +2436,8 @@ static void switch_names(struct dentry *dentry, struct dentry *target, ...@@ -2436,6 +2436,8 @@ static void switch_names(struct dentry *dentry, struct dentry *target,
*/ */
unsigned int i; unsigned int i;
BUILD_BUG_ON(!IS_ALIGNED(DNAME_INLINE_LEN, sizeof(long))); 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);
if (!exchange) { if (!exchange) {
memcpy(dentry->d_iname, target->d_name.name, memcpy(dentry->d_iname, target->d_name.name,
target->d_name.len + 1); target->d_name.len + 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment