* [PATCH v2 1/2] commands: ls: explicitly check for directories with S_ISDIR
@ 2022-06-02 19:59 Ahmad Fatoum
2022-06-02 19:59 ` [PATCH v2 2/2] block: set S_IFBLK for block devices instead of S_IFCHR Ahmad Fatoum
2022-06-07 7:03 ` [PATCH v2 1/2] commands: ls: explicitly check for directories with S_ISDIR Sascha Hauer
0 siblings, 2 replies; 3+ messages in thread
From: Ahmad Fatoum @ 2022-06-02 19:59 UTC (permalink / raw)
To: barebox; +Cc: Ahmad Fatoum
S_ISDIR(mode) is implemented as (mode & S_IFMT) == S_IFDIR, which
accounts for file modes setting multiple bits. So far, this was not the
case, but upcoming S_IFBLK equals (S_IFCHR | S_IFDIR), which would fail
the existing checks, so prepare for that by fixing them.
No functional change. There are no other instances of this elsewhere in
the code base.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 -> v2:
- new patch
---
commands/ls.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/commands/ls.c b/commands/ls.c
index bedf2e1c4288..1192aed971cf 100644
--- a/commands/ls.c
+++ b/commands/ls.c
@@ -63,10 +63,10 @@ int ls(const char *path, ulong flags)
if (stat(path, &s))
return -errno;
- if (flags & LS_SHOWARG && s.st_mode & S_IFDIR)
+ if (flags & LS_SHOWARG && S_ISDIR(s.st_mode))
printf("%s:\n", path);
- if (!(s.st_mode & S_IFDIR)) {
+ if (!S_ISDIR(s.st_mode)) {
ls_one(path, path);
return 0;
}
@@ -112,7 +112,7 @@ int ls(const char *path, ulong flags)
continue;
}
- if (s.st_mode & S_IFDIR)
+ if (S_ISDIR(s.st_mode))
ls(tmp, flags);
}
@@ -171,7 +171,7 @@ static int do_ls(int argc, char *argv[])
continue;
}
- if (!(s.st_mode & S_IFDIR)) {
+ if (!S_ISDIR(s.st_mode)) {
if (flags & LS_COLUMN)
string_list_add_sorted(&sl, argv[o]);
else
@@ -197,7 +197,7 @@ static int do_ls(int argc, char *argv[])
continue;
}
- if (s.st_mode & S_IFDIR) {
+ if (S_ISDIR(s.st_mode)) {
ret = ls(argv[o], flags);
if (ret) {
perror("ls");
--
2.30.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH v2 2/2] block: set S_IFBLK for block devices instead of S_IFCHR
2022-06-02 19:59 [PATCH v2 1/2] commands: ls: explicitly check for directories with S_ISDIR Ahmad Fatoum
@ 2022-06-02 19:59 ` Ahmad Fatoum
2022-06-07 7:03 ` [PATCH v2 1/2] commands: ls: explicitly check for directories with S_ISDIR Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Ahmad Fatoum @ 2022-06-02 19:59 UTC (permalink / raw)
To: barebox; +Cc: Jules Maselbas
From: Ahmad Fatoum <ahmad@a3f.at>
In barebox, block devices are a special case of character devices.
Nevertheless, differentiation can be useful to allow scripts iterating
over all block devices without accounting for naming, e.g.
for dev in /dev/*; do
test -b $dev && echo $dev: blockdevice
done
Add the necessary support. This will break scripts that assume
test -c blockdevice to be true, but that's a quite improbable check.
Tested-by: Jules Maselbas <jmaselbas@kalray.eu>
Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
v1 -> v2:
- Collected Jules Tested-by
- added !CONFIG_BLOCK stub for cdev_get_block_device (Sascha)
- added !cdev check to cdev_get_block_device
---
commands/memtester/memtester.c | 2 +-
common/block.c | 8 ++++++++
fs/devfs.c | 7 ++++++-
fs/legacy.c | 1 +
include/block.h | 9 +++++++++
5 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/commands/memtester/memtester.c b/commands/memtester/memtester.c
index 130dc97c8334..f4adbfc855cb 100644
--- a/commands/memtester/memtester.c
+++ b/commands/memtester/memtester.c
@@ -113,7 +113,7 @@ static int do_memtester(int argc, char **argv) {
strerror(errno));
return COMMAND_ERROR_USAGE;
} else {
- if (!S_ISCHR(statbuf.st_mode)) {
+ if (!S_ISCHR(statbuf.st_mode) && !S_ISBLK(statbuf.st_mode)) {
printf("can not mmap non-char device %s\n",
optarg);
return COMMAND_ERROR_USAGE;
diff --git a/common/block.c b/common/block.c
index 1d386edcfd49..19bb81df2c3d 100644
--- a/common/block.c
+++ b/common/block.c
@@ -361,6 +361,14 @@ static struct cdev_operations block_ops = {
.discard_range = block_op_discard_range,
};
+struct block_device *cdev_get_block_device(struct cdev *cdev)
+{
+ if (!cdev || cdev->ops != &block_ops)
+ return NULL;
+
+ return container_of(cdev, struct block_device, cdev);
+}
+
int blockdevice_register(struct block_device *blk)
{
loff_t size = (loff_t)blk->num_blocks * BLOCKSIZE(blk);
diff --git a/fs/devfs.c b/fs/devfs.c
index deb244feeab6..49cd48f6d84e 100644
--- a/fs/devfs.c
+++ b/fs/devfs.c
@@ -29,6 +29,7 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/mtd-abi.h>
#include <partition.h>
+#include <block.h>
struct devfs_inode {
struct inode inode;
@@ -231,6 +232,7 @@ static struct inode *devfs_get_inode(struct super_block *sb, const struct inode
default:
return NULL;
case S_IFCHR:
+ case S_IFBLK:
inode->i_op = &devfs_file_inode_operations;
inode->i_fop = &devfs_file_operations;
break;
@@ -250,12 +252,15 @@ static struct dentry *devfs_lookup(struct inode *dir, struct dentry *dentry,
struct devfs_inode *dinode;
struct inode *inode;
struct cdev *cdev;
+ umode_t mode;
cdev = cdev_by_name(dentry->name);
if (!cdev)
return ERR_PTR(-ENOENT);
- inode = devfs_get_inode(dir->i_sb, dir, S_IFCHR);
+ mode = cdev_get_block_device(cdev) ? S_IFBLK : S_IFCHR;
+
+ inode = devfs_get_inode(dir->i_sb, dir, mode);
if (!inode)
return ERR_PTR(-ENOMEM);
diff --git a/fs/legacy.c b/fs/legacy.c
index fc6a18f408ed..779f54629440 100644
--- a/fs/legacy.c
+++ b/fs/legacy.c
@@ -288,6 +288,7 @@ static struct inode *legacy_get_inode(struct super_block *sb, const struct inode
return NULL;
case S_IFREG:
case S_IFCHR:
+ case S_IFBLK:
inode->i_op = &legacy_file_inode_operations;
break;
case S_IFDIR:
diff --git a/include/block.h b/include/block.h
index d3a154bf73c0..1fb40e942f9f 100644
--- a/include/block.h
+++ b/include/block.h
@@ -49,4 +49,13 @@ static inline int block_flush(struct block_device *blk)
return cdev_flush(&blk->cdev);
}
+#ifdef CONFIG_BLOCK
+struct block_device *cdev_get_block_device(struct cdev *cdev);
+#else
+static inline struct block_device *cdev_get_block_device(struct cdev *cdev)
+{
+ return NULL;
+}
+#endif
+
#endif /* __BLOCK_H */
--
2.30.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2 1/2] commands: ls: explicitly check for directories with S_ISDIR
2022-06-02 19:59 [PATCH v2 1/2] commands: ls: explicitly check for directories with S_ISDIR Ahmad Fatoum
2022-06-02 19:59 ` [PATCH v2 2/2] block: set S_IFBLK for block devices instead of S_IFCHR Ahmad Fatoum
@ 2022-06-07 7:03 ` Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2022-06-07 7:03 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: barebox
On Thu, Jun 02, 2022 at 09:59:15PM +0200, Ahmad Fatoum wrote:
> S_ISDIR(mode) is implemented as (mode & S_IFMT) == S_IFDIR, which
> accounts for file modes setting multiple bits. So far, this was not the
> case, but upcoming S_IFBLK equals (S_IFCHR | S_IFDIR), which would fail
> the existing checks, so prepare for that by fixing them.
>
> No functional change. There are no other instances of this elsewhere in
> the code base.
>
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
Applied, thanks
Sascha
> v1 -> v2:
> - new patch
> ---
> commands/ls.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/commands/ls.c b/commands/ls.c
> index bedf2e1c4288..1192aed971cf 100644
> --- a/commands/ls.c
> +++ b/commands/ls.c
> @@ -63,10 +63,10 @@ int ls(const char *path, ulong flags)
> if (stat(path, &s))
> return -errno;
>
> - if (flags & LS_SHOWARG && s.st_mode & S_IFDIR)
> + if (flags & LS_SHOWARG && S_ISDIR(s.st_mode))
> printf("%s:\n", path);
>
> - if (!(s.st_mode & S_IFDIR)) {
> + if (!S_ISDIR(s.st_mode)) {
> ls_one(path, path);
> return 0;
> }
> @@ -112,7 +112,7 @@ int ls(const char *path, ulong flags)
> continue;
> }
>
> - if (s.st_mode & S_IFDIR)
> + if (S_ISDIR(s.st_mode))
> ls(tmp, flags);
> }
>
> @@ -171,7 +171,7 @@ static int do_ls(int argc, char *argv[])
> continue;
> }
>
> - if (!(s.st_mode & S_IFDIR)) {
> + if (!S_ISDIR(s.st_mode)) {
> if (flags & LS_COLUMN)
> string_list_add_sorted(&sl, argv[o]);
> else
> @@ -197,7 +197,7 @@ static int do_ls(int argc, char *argv[])
> continue;
> }
>
> - if (s.st_mode & S_IFDIR) {
> + if (S_ISDIR(s.st_mode)) {
> ret = ls(argv[o], flags);
> if (ret) {
> perror("ls");
> --
> 2.30.2
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-06-07 7:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-02 19:59 [PATCH v2 1/2] commands: ls: explicitly check for directories with S_ISDIR Ahmad Fatoum
2022-06-02 19:59 ` [PATCH v2 2/2] block: set S_IFBLK for block devices instead of S_IFCHR Ahmad Fatoum
2022-06-07 7:03 ` [PATCH v2 1/2] commands: ls: explicitly check for directories with S_ISDIR Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox