| From: Andrew Morton <akpm@linux-foundation.org> |
| Subject: hfsplus-remove-unnecessary-variable-initialization-fix |
| Date: Wed Dec 21 01:32:43 PM PST 2022 |
| |
| give hfsplus_listxattr:key_len narrower scope |
| |
| Cc: XU pengfei <xupengfei@nfschina.com> |
| Cc: Andrew Morton <akpm@linux-foudation.org> |
| Cc: Christian Brauner <brauner@kernel.org> |
| Cc: Kees Cook <keescook@chromium.org> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| |
| --- a/fs/hfsplus/xattr.c~hfsplus-remove-unnecessary-variable-initialization-fix |
| +++ a/fs/hfsplus/xattr.c |
| @@ -677,7 +677,6 @@ ssize_t hfsplus_listxattr(struct dentry |
| ssize_t res; |
| struct inode *inode = d_inode(dentry); |
| struct hfs_find_data fd; |
| - u16 key_len; |
| struct hfsplus_attr_key attr_key; |
| char *strbuf; |
| int xattr_name_len; |
| @@ -719,7 +718,8 @@ ssize_t hfsplus_listxattr(struct dentry |
| } |
| |
| for (;;) { |
| - key_len = hfs_bnode_read_u16(fd.bnode, fd.keyoffset); |
| + u16 key_len = hfs_bnode_read_u16(fd.bnode, fd.keyoffset); |
| + |
| if (key_len == 0 || key_len > fd.tree->max_key_len) { |
| pr_err("invalid xattr key length: %d\n", key_len); |
| res = -EIO; |
| _ |
