pci: Add checks to prevent config space overflow

[J-u-boot.git] / cmd / fat.c

diff --git a/cmd/fat.c b/cmd/fat.c
index aae993d2b9a486c7ca1bdc16c10f7c84e9c817b9..69ce1fa5300bb6a8a46600057e57eafb45220ee6 100644 (file)
--- a/cmd/fat.c
+++ b/cmd/fat.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2002
  * Richard Jones, [email protected]
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -10,16 +9,13 @@
  */
 #include <common.h>
 #include <command.h>
-#include <s_record.h>
-#include <net.h>
-#include <ata.h>
-#include <asm/io.h>
 #include <mapmem.h>
-#include <part.h>
 #include <fat.h>
 #include <fs.h>
+#include <part.h>
+#include <asm/cache.h>
 
-int do_fat_size(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_fat_size(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        return do_size(cmdtp, flag, argc, argv, FS_TYPE_FAT);
 }
@@ -32,7 +28,7 @@ U_BOOT_CMD(
        "      and determine its size."
 );
 
-int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_fat_fsload(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        return do_load(cmdtp, flag, argc, argv, FS_TYPE_FAT);
 }
@@ -53,7 +49,8 @@ U_BOOT_CMD(
        "      be printed and performance will suffer for the load."
 );
 
-static int do_fat_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_fat_ls(struct cmd_tbl *cmdtp, int flag, int argc,
+                    char *const argv[])
 {
        return do_ls(cmdtp, flag, argc, argv, FS_TYPE_FAT);
 }
@@ -65,23 +62,23 @@ U_BOOT_CMD(
        "    - list files from 'dev' on 'interface' in a 'directory'"
 );
 
-static int do_fat_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc,
-                        char * const argv[])
+static int do_fat_fsinfo(struct cmd_tbl *cmdtp, int flag, int argc,
+                        char *const argv[])
 {
        int dev, part;
-       block_dev_desc_t *dev_desc;
-       disk_partition_t info;
+       struct blk_desc *dev_desc;
+       struct disk_partition info;
 
        if (argc < 2) {
                printf("usage: fatinfo <interface> [<dev[:part]>]\n");
                return 0;
        }
 
-       part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1);
+       part = blk_get_device_part_str(argv[1], argv[2], &dev_desc, &info, 1);
        if (part < 0)
                return 1;
 
-       dev = dev_desc->dev;
+       dev = dev_desc->devnum;
        if (fat_set_blk_dev(dev_desc, &info) != 0) {
                printf("\n** Unable to use %s %d:%d for fatinfo **\n",
                        argv[1], dev, part);
@@ -98,55 +95,43 @@ U_BOOT_CMD(
 );
 
 #ifdef CONFIG_FAT_WRITE
-static int do_fat_fswrite(cmd_tbl_t *cmdtp, int flag,
-               int argc, char * const argv[])
+static int do_fat_fswrite(struct cmd_tbl *cmdtp, int flag, int argc,
+                         char *const argv[])
 {
-       loff_t size;
-       int ret;
-       unsigned long addr;
-       unsigned long count;
-       block_dev_desc_t *dev_desc = NULL;
-       disk_partition_t info;
-       int dev = 0;
-       int part = 1;
-       void *buf;
-
-       if (argc < 5)
-               return cmd_usage(cmdtp);
-
-       part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1);
-       if (part < 0)
-               return 1;
+       return do_save(cmdtp, flag, argc, argv, FS_TYPE_FAT);
+}
 
-       dev = dev_desc->dev;
+U_BOOT_CMD(
+       fatwrite,       7,      0,      do_fat_fswrite,
+       "write file into a dos filesystem",
+       "<interface> <dev[:part]> <addr> <filename> [<bytes> [<offset>]]\n"
+       "    - write file 'filename' from the address 'addr' in RAM\n"
+       "      to 'dev' on 'interface'"
+);
 
-       if (fat_set_blk_dev(dev_desc, &info) != 0) {
-               printf("\n** Unable to use %s %d:%d for fatwrite **\n",
-                       argv[1], dev, part);
-               return 1;
-       }
-       addr = simple_strtoul(argv[3], NULL, 16);
-       count = simple_strtoul(argv[5], NULL, 16);
-
-       buf = map_sysmem(addr, count);
-       ret = file_fat_write(argv[4], buf, 0, count, &size);
-       unmap_sysmem(buf);
-       if (ret < 0) {
-               printf("\n** Unable to write \"%s\" from %s %d:%d **\n",
-                       argv[4], argv[1], dev, part);
-               return 1;
-       }
+static int do_fat_rm(struct cmd_tbl *cmdtp, int flag, int argc,
+                    char *const argv[])
+{
+       return do_rm(cmdtp, flag, argc, argv, FS_TYPE_FAT);
+}
 
-       printf("%llu bytes written\n", size);
+U_BOOT_CMD(
+       fatrm,  4,      1,      do_fat_rm,
+       "delete a file",
+       "<interface> [<dev[:part]>] <filename>\n"
+       "    - delete a file from 'dev' on 'interface'"
+);
 
-       return 0;
+static int do_fat_mkdir(struct cmd_tbl *cmdtp, int flag, int argc,
+                       char *const argv[])
+{
+       return do_mkdir(cmdtp, flag, argc, argv, FS_TYPE_FAT);
 }
 
 U_BOOT_CMD(
-       fatwrite,       6,      0,      do_fat_fswrite,
-       "write file into a dos filesystem",
-       "<interface> <dev[:part]> <addr> <filename> <bytes>\n"
-       "    - write file 'filename' from the address 'addr' in RAM\n"
-       "      to 'dev' on 'interface'"
+       fatmkdir,       4,      1,      do_fat_mkdir,
+       "create a directory",
+       "<interface> [<dev[:part]>] <directory>\n"
+       "    - create a directory in 'dev' on 'interface'"
 );
 #endif