kernel/linux.git/fs/adfs/dir_fplus.c, branch v6.18.22Linux kernel stable tree (mirror)https://git.radix-linux.su/kernel/linux.git/atom?h=v6.18.222020-01-25T16:31:59+00:00fs/adfs: bigdir: Fix an error code in adfs_fplus_read()2020-01-25T16:31:59+00:00Dan Carpenterdan.carpenter@oracle.com2020-01-24T10:15:37+00:00urn:sha1:587065dcac64e88132803cdb0a7f26bb4a79cf46
This code accidentally returns success, but it should return the
-EIO error code from adfs_fplus_validate_header().
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Fixes: d79288b4f61b ("fs/adfs: bigdir: calculate and validate directory checkbyte")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/adfs: bigdir: implement directory update support2020-01-21T01:12:42+00:00Russell Kingrmk+kernel@armlinux.org.uk2019-12-09T11:11:13+00:00urn:sha1:a464152f2e6dfd6d8be45c5e591cb8be20a97bdb
Implement big directory entry update support in the same way that we
do for new directories.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/adfs: bigdir: calculate and validate directory checkbyte2020-01-21T01:12:42+00:00Russell Kingrmk+kernel@armlinux.org.uk2019-12-09T11:11:08+00:00urn:sha1:d79288b4f61b40976182786ba2cb05ed5f2b6945
When reading a big directory, calculate the validate the directory
checkbyte to ensure that the directory contents are valid.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/adfs: bigdir: directory validation strengthening2020-01-21T01:12:42+00:00Russell Kingrmk+kernel@armlinux.org.uk2019-12-09T11:11:02+00:00urn:sha1:aa3d4e015298fd523617c2bea392d02ea19eaa1a
Strengthen the directory validation by ensuring that the header fields
contain sensible values that fit inside the directory, and limit the
directory size to 4MB as per RISC OS requirements.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/adfs: bigdir: extract directory validation2020-01-21T01:12:42+00:00Russell Kingrmk+kernel@armlinux.org.uk2019-12-09T11:10:57+00:00urn:sha1:6674ecab9004dcc4d8a65744f581b9ccf1f17504
Extract the directory validation from the directory reading function as
we will want to re-use this code.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/adfs: bigdir: factor out directory entry offset calculation2020-01-21T01:12:42+00:00Russell Kingrmk+kernel@armlinux.org.uk2019-12-09T11:10:52+00:00urn:sha1:0db35a02a1c3f3abdfac9d56c1cee2fe23b66987
Factor out the directory entry byte offset calculation.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/adfs: dir: use pointers to access directory head/tails2020-01-21T01:12:41+00:00Russell Kingrmk+kernel@armlinux.org.uk2019-12-09T11:10:21+00:00urn:sha1:016936b32131d0b33328d8c109f83fabb56618a3
Add and use pointers in the adfs_dir structure to access the directory
head and tail structures, which will always be contiguous in a buffer.
This allows us to avoid memcpy()ing the data in the new directory code,
making it slightly more efficient.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/adfs: dir: add more efficient iterate() per-format method2020-01-21T01:12:41+00:00Russell Kingrmk+kernel@armlinux.org.uk2019-12-09T11:10:16+00:00urn:sha1:4287e4deb1280633ffbda608f946d6d7c2d76d4a
Rather than using setpos + getnext to iterate through the directory
entries, pass iterate() down to the dir format code to populate the
dirents.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/adfs: dir: add generic directory reading2020-01-21T01:12:41+00:00Russell Kingrmk+kernel@armlinux.org.uk2019-12-09T11:09:35+00:00urn:sha1:419a6e5e82ca0bdba0cc3624d969b65ae49d959b
Both directory formats code the mechanics of fetching the directory
buffers using their own implementations. Consolidate these into one
implementation.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/adfs: dir: add generic copy functions2020-01-21T01:12:41+00:00Russell Kingrmk+kernel@armlinux.org.uk2019-12-09T11:09:30+00:00urn:sha1:a317120bf7f8306b594ee650ee14f08a0e599602
Directories can span multiple buffers, and we currently open-code
memcpy access to these buffers, including dealing with entries that
are split across multiple buffers. Such code exists in both
directory format implementations.
Provide common functions to allow data to be copied from/to the
directory buffers as if they were a contiguous set of buffers, and
use them when accessing directories.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>