Fix the warnings raised by Sparse (#92)

Sparse[1] is a semantic parser, capable of finding out the potential
problems of Linux kernel code. This patch fixed the warnings.

[1] https://www.kernel.org/doc/html/latest/dev-tools/sparse.html

diff --git a/examples/bottomhalf.c b/examples/bottomhalf.c
index e80f1d913cc7ef26a7e6340b99e3717a896e6aa6..585c141c2da6c120b39aa6bdd84a18cccdd36671 100644 (file)
--- a/examples/bottomhalf.c
+++ b/examples/bottomhalf.c
@@ -45,7 +45,7 @@ static void bottomhalf_tasklet_fn(unsigned long data)
     pr_info("Bottom half tasklet ends\n");
 }
 
-DECLARE_TASKLET_OLD(buttontask, bottomhalf_tasklet_fn);
+static DECLARE_TASKLET_OLD(buttontask, bottomhalf_tasklet_fn);
 
 /* interrupt function triggered when a button is pressed */
 static irqreturn_t button_isr(int irq, void *data)

diff --git a/examples/chardev.c b/examples/chardev.c
index 475b6391d86124119c450373cc354170a8bdbd31..ecbb1433ececb922d023ea6e7ae1e11ff2f7770f 100644 (file)
--- a/examples/chardev.c
+++ b/examples/chardev.c
@@ -16,8 +16,9 @@
 /*  Prototypes - this would normally go in a .h file */
 static int device_open(struct inode *, struct file *);
 static int device_release(struct inode *, struct file *);
-static ssize_t device_read(struct file *, char *, size_t, loff_t *);
-static ssize_t device_write(struct file *, const char *, size_t, loff_t *);
+static ssize_t device_read(struct file *, char __user *, size_t, loff_t *);
+static ssize_t device_write(struct file *, const char __user *, size_t,
+                            loff_t *);
 
 #define SUCCESS 0
 #define DEVICE_NAME "chardev" /* Dev name as it appears in /proc/devices   */
@@ -105,7 +106,7 @@ static int device_release(struct inode *inode, struct file *file)
  * read from it.
  */
 static ssize_t device_read(struct file *filp, /* see include/linux/fs.h   */
-                           char *buffer, /* buffer to fill with data */
+                           char __user *buffer, /* buffer to fill with data */
                            size_t length, /* length of the buffer     */
                            loff_t *offset)
 {
@@ -134,8 +135,8 @@ static ssize_t device_read(struct file *filp, /* see include/linux/fs.h   */
 }
 
 /* Called when a process writes to dev file: echo "hi" > /dev/hello */
-static ssize_t device_write(struct file *filp, const char *buff, size_t len,
-                            loff_t *off)
+static ssize_t device_write(struct file *filp, const char __user *buff,
+                            size_t len, loff_t *off)
 {
     pr_alert("Sorry, this operation is not supported.\n");
     return -EINVAL;

diff --git a/examples/chardev2.c b/examples/chardev2.c
index f00cd73c2eb165772bd0b38de9bed0c3c090bfb2..bb98633872997f903145b1f59b5ff5df83d14233 100644 (file)
--- a/examples/chardev2.c
+++ b/examples/chardev2.c
@@ -121,9 +121,10 @@ static ssize_t device_write(struct file *file, const char __user *buffer,
  * If the ioctl is write or read/write (meaning output is returned to the
  * calling process), the ioctl call returns the output of this function.
  */
-long device_ioctl(struct file *file, /* ditto */
-                  unsigned int ioctl_num, /* number and param for ioctl */
-                  unsigned long ioctl_param)
+static long
+device_ioctl(struct file *file, /* ditto */
+             unsigned int ioctl_num, /* number and param for ioctl */
+             unsigned long ioctl_param)
 {
     int i;
     char *temp;
@@ -139,23 +140,23 @@ long device_ioctl(struct file *file, /* ditto */
         temp = (char *)ioctl_param;
 
         /* Find the length of the message */
-        get_user(ch, temp);
+        get_user(ch, (char __user *)temp);
         for (i = 0; ch && i < BUF_LEN; i++, temp++)
-            get_user(ch, temp);
+            get_user(ch, (char __user *)temp);
 
-        device_write(file, (char *)ioctl_param, i, 0);
+        device_write(file, (char __user *)ioctl_param, i, NULL);
         break;
 
     case IOCTL_GET_MSG:
         /* Give the current message to the calling process - the parameter
          * we got is a pointer, fill it.
          */
-        i = device_read(file, (char *)ioctl_param, 99, 0);
+        i = device_read(file, (char __user *)ioctl_param, 99, NULL);
 
         /* Put a zero at the end of the buffer, so it will be properly
          * terminated.
          */
-        put_user('\0', (char *)ioctl_param + i);
+        put_user('\0', (char __user *)ioctl_param + i);
         break;
 
     case IOCTL_GET_NTH_BYTE:
@@ -176,7 +177,7 @@ long device_ioctl(struct file *file, /* ditto */
  * is kept in the devices table, it can't be local to init_module. NULL is
  * for unimplemented functions.
  */
-struct file_operations fops = {
+static struct file_operations fops = {
     .read = device_read,
     .write = device_write,
     .unlocked_ioctl = device_ioctl,

diff --git a/examples/completions.c b/examples/completions.c
index 64e0ec2c87abfe3db967a1cd79e43202efed7851..dddf5d74838e6d57b6d9bef41270d00009e7a523 100644 (file)
--- a/examples/completions.c
+++ b/examples/completions.c
@@ -61,7 +61,7 @@ ERROR_THREAD_1:
     return -1;
 }
 
-void completions_exit(void)
+static void completions_exit(void)
 {
     wait_for_completion(&machine.crank_comp);
     wait_for_completion(&machine.flywheel_comp);

diff --git a/examples/cryptosha256.c b/examples/cryptosha256.c
index 99725d37def22ab49b095830b0e42f20d8c4580a..be2767a13339b1e817b731a78e0e06fdb8be5a39 100644 (file)
--- a/examples/cryptosha256.c
+++ b/examples/cryptosha256.c
@@ -18,7 +18,7 @@ static void show_hash_result(char *plaintext, char *hash_sha256)
     pr_info("%s\n", str);
 }
 
-int cryptosha256_init(void)
+static int cryptosha256_init(void)
 {
     char *plaintext = "This is a test";
     char hash_sha256[SHA256_LENGTH];
@@ -53,7 +53,7 @@ int cryptosha256_init(void)
     return 0;
 }
 
-void cryptosha256_exit(void)
+static void cryptosha256_exit(void)
 {
 }
 

diff --git a/examples/cryptosk.c b/examples/cryptosk.c
index f31d8c71ad8cf182043ac02d18e84a972e92897c..ece6a0380354049eae30fdefda0bd1b2188416d8 100644 (file)
--- a/examples/cryptosk.c
+++ b/examples/cryptosk.c
@@ -171,7 +171,7 @@ out:
     return ret;
 }
 
-int cryptoapi_init(void)
+static int cryptoapi_init(void)
 {
     /* The world's favorite password */
     char *password = "password123";
@@ -186,7 +186,7 @@ int cryptoapi_init(void)
     return 0;
 }
 
-void cryptoapi_exit(void)
+static void cryptoapi_exit(void)
 {
     test_skcipher_finish(&sk);
 }

diff --git a/examples/example_mutex.c b/examples/example_mutex.c
index 653a50e739549ae0208bf37b6aea680837a1c949..4eaf823175ccf670ea006021bf79010b8cf4b9d3 100644 (file)
--- a/examples/example_mutex.c
+++ b/examples/example_mutex.c
@@ -6,7 +6,7 @@
 #include <linux/module.h>
 #include <linux/mutex.h>
 
-DEFINE_MUTEX(mymutex);
+static DEFINE_MUTEX(mymutex);
 
 static int example_mutex_init(void)
 {

diff --git a/examples/example_rwlock.c b/examples/example_rwlock.c
index 9ef05673a13087b1dd4819a86f34c799153f14e4..74a903f17e912a3f3125949891c0a9210a3b780a 100644 (file)
--- a/examples/example_rwlock.c
+++ b/examples/example_rwlock.c
@@ -5,7 +5,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 
-DEFINE_RWLOCK(myrwlock);
+static DEFINE_RWLOCK(myrwlock);
 
 static void example_read_lock(void)
 {

diff --git a/examples/example_spinlock.c b/examples/example_spinlock.c
index 337c9d4b794af1793bd6458e5bdc374bfeaa17c3..5b69df198075be7b169bc3b20d1b9b300a14cf17 100644 (file)
--- a/examples/example_spinlock.c
+++ b/examples/example_spinlock.c
@@ -7,8 +7,8 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 
-DEFINE_SPINLOCK(sl_static);
-spinlock_t sl_dynamic;
+static DEFINE_SPINLOCK(sl_static);
+static spinlock_t sl_dynamic;
 
 static void example_spinlock_static(void)
 {

diff --git a/examples/example_tasklet.c b/examples/example_tasklet.c
index c5502f0d694c1cb85e3f97b2618fb4bfe7f6cf9a..ee3985c5a59bbdab1122d37700b7502814f0a47c 100644 (file)
--- a/examples/example_tasklet.c
+++ b/examples/example_tasklet.c
@@ -20,7 +20,7 @@ static void tasklet_fn(unsigned long data)
     pr_info("Example tasklet ends\n");
 }
 
-DECLARE_TASKLET_OLD(mytask, tasklet_fn);
+static DECLARE_TASKLET_OLD(mytask, tasklet_fn);
 
 static int example_tasklet_init(void)
 {

diff --git a/examples/ioctl.c b/examples/ioctl.c
index 7f35649cfbf7968d7277367fde994a47d6982857..23b7ebce0712f5c2ea62db1ce4654cf13df6402c 100644 (file)
--- a/examples/ioctl.c
+++ b/examples/ioctl.c
@@ -86,8 +86,8 @@ done:
     return retval;
 }
 
-ssize_t test_ioctl_read(struct file *filp, char __user *buf, size_t count,
-                        loff_t *f_pos)
+static ssize_t test_ioctl_read(struct file *filp, char __user *buf,
+                               size_t count, loff_t *f_pos)
 {
     struct test_ioctl_data *ioctl_data = filp->private_data;
     unsigned char val;
@@ -139,7 +139,7 @@ static int test_ioctl_open(struct inode *inode, struct file *filp)
     return 0;
 }
 
-struct file_operations fops = {
+static struct file_operations fops = {
     .owner = THIS_MODULE,
     .open = test_ioctl_open,
     .release = test_ioctl_close,

diff --git a/examples/kbleds.c b/examples/kbleds.c
index 057912fc7038322935dde20a25b9d72ba0b2ae69..07a2357f69ea31036f9b25a64b4f7eeb4721a904 100644 (file)
--- a/examples/kbleds.c
+++ b/examples/kbleds.c
@@ -13,9 +13,9 @@
 
 MODULE_DESCRIPTION("Example module illustrating the use of Keyboard LEDs.");
 
-struct timer_list my_timer;
-struct tty_driver *my_driver;
-char kbledstatus = 0;
+static struct timer_list my_timer;
+static struct tty_driver *my_driver;
+static char kbledstatus = 0;
 
 #define BLINK_DELAY HZ / 5
 #define ALL_LEDS_ON 0x07

diff --git a/examples/procfs1.c b/examples/procfs1.c
index 11b010a837612365f478509859087e9220adfe82..9db809e035b9fea03516680bb20c66db99b53912 100644 (file)
--- a/examples/procfs1.c
+++ b/examples/procfs1.c
@@ -14,10 +14,10 @@
 
 #define procfs_name "helloworld"
 
-struct proc_dir_entry *our_proc_file;
+static struct proc_dir_entry *our_proc_file;
 
-ssize_t procfile_read(struct file *filePointer, char *buffer,
-                      size_t buffer_length, loff_t *offset)
+static ssize_t procfile_read(struct file *filePointer, char __user *buffer,
+                             size_t buffer_length, loff_t *offset)
 {
     char s[13] = "HelloWorld!\n";
     int len = sizeof(s);

diff --git a/examples/procfs2.c b/examples/procfs2.c
index 88717fe264b8732f118b0f2244972a89295b97d9..aa36d9ca27cc63277bc24bf72acb40b8803e1139 100644 (file)
--- a/examples/procfs2.c
+++ b/examples/procfs2.c
@@ -25,8 +25,8 @@ static char procfs_buffer[PROCFS_MAX_SIZE];
 static unsigned long procfs_buffer_size = 0;
 
 /* This function is called then the /proc file is read */
-ssize_t procfile_read(struct file *filePointer, char *buffer,
-                      size_t buffer_length, loff_t *offset)
+static ssize_t procfile_read(struct file *filePointer, char __user *buffer,
+                             size_t buffer_length, loff_t *offset)
 {
     char s[13] = "HelloWorld!\n";
     int len = sizeof(s);
@@ -44,8 +44,8 @@ ssize_t procfile_read(struct file *filePointer, char *buffer,
 }
 
 /* This function is called with the /proc file is written. */
-static ssize_t procfile_write(struct file *file, const char *buff, size_t len,
-                              loff_t *off)
+static ssize_t procfile_write(struct file *file, const char __user *buff,
+                              size_t len, loff_t *off)
 {
     procfs_buffer_size = len;
     if (procfs_buffer_size > PROCFS_MAX_SIZE)

diff --git a/examples/procfs3.c b/examples/procfs3.c
index f19f16921dd8ccf3f2c6f352e2be85e44223f3f5..bbf40ce41d71e47acb035fa0d3ab7892e4dd0fa0 100644 (file)
--- a/examples/procfs3.c
+++ b/examples/procfs3.c
@@ -16,12 +16,12 @@
 #define PROCFS_MAX_SIZE 2048
 #define PROCFS_ENTRY_FILENAME "buffer2k"
 
-struct proc_dir_entry *our_proc_file;
+static struct proc_dir_entry *our_proc_file;
 static char procfs_buffer[PROCFS_MAX_SIZE];
 static unsigned long procfs_buffer_size = 0;
 
-static ssize_t procfs_read(struct file *filp, char *buffer, size_t length,
-                           loff_t *offset)
+static ssize_t procfs_read(struct file *filp, char __user *buffer,
+                           size_t length, loff_t *offset)
 {
     static int finished = 0;
 
@@ -38,8 +38,8 @@ static ssize_t procfs_read(struct file *filp, char *buffer, size_t length,
     pr_debug("procfs_read: read %lu bytes\n", procfs_buffer_size);
     return procfs_buffer_size;
 }
-static ssize_t procfs_write(struct file *file, const char *buffer, size_t len,
-                            loff_t *off)
+static ssize_t procfs_write(struct file *file, const char __user *buffer,
+                            size_t len, loff_t *off)
 {
     if (len > PROCFS_MAX_SIZE)
         procfs_buffer_size = PROCFS_MAX_SIZE;
@@ -51,12 +51,12 @@ static ssize_t procfs_write(struct file *file, const char *buffer, size_t len,
     pr_debug("procfs_write: write %lu bytes\n", procfs_buffer_size);
     return procfs_buffer_size;
 }
-int procfs_open(struct inode *inode, struct file *file)
+static int procfs_open(struct inode *inode, struct file *file)
 {
     try_module_get(THIS_MODULE);
     return 0;
 }
-int procfs_close(struct inode *inode, struct file *file)
+static int procfs_close(struct inode *inode, struct file *file)
 {
     module_put(THIS_MODULE);
     return 0;

diff --git a/examples/sleep.c b/examples/sleep.c
index e7688fedafbf1f10215d960396e1a837d9299974..f4a953ef53558fc69fed661159f29ce0157ecf8a 100644 (file)
--- a/examples/sleep.c
+++ b/examples/sleep.c
@@ -29,7 +29,7 @@ static struct proc_dir_entry *our_proc_file;
  * function.
  */
 static ssize_t module_output(struct file *file, /* see include/linux/fs.h   */
-                             char *buf, /* The buffer to put data to
+                             char __user *buf, /* The buffer to put data to
                                                    (in the user segment)    */
                              size_t len, /* The length of the buffer */
                              loff_t *offset)
@@ -58,7 +58,7 @@ static ssize_t module_output(struct file *file, /* see include/linux/fs.h   */
  * /proc file.
  */
 static ssize_t module_input(struct file *file, /* The file itself */
-                            const char *buf, /* The buffer with input */
+                            const char __user *buf, /* The buffer with input */
                             size_t length, /* The buffer's length */
                             loff_t *offset) /* offset to file - ignore */
 {
@@ -77,10 +77,10 @@ static ssize_t module_input(struct file *file, /* The file itself */
 }
 
 /* 1 if the file is currently open by somebody */
-int already_open = 0;
+static int already_open = 0;
 
 /* Queue of processes who want our file */
-DECLARE_WAIT_QUEUE_HEAD(waitq);
+static DECLARE_WAIT_QUEUE_HEAD(waitq);
 
 /* Called when the /proc file is opened */
 static int module_open(struct inode *inode, struct file *file)
@@ -141,7 +141,7 @@ static int module_open(struct inode *inode, struct file *file)
 }
 
 /* Called when the /proc file is closed */
-int module_close(struct inode *inode, struct file *file)
+static int module_close(struct inode *inode, struct file *file)
 {
     /* Set already_open to zero, so one of the processes in the waitq will
      * be able to set already_open back to one and to open the file. All

diff --git a/examples/stop.c b/examples/stop.c
index 77fa67586b81875cc0023dbc7d2309396d7a7613..4dc4a13f163289fe8644241d2e4c79d777c0edbc 100644 (file)
--- a/examples/stop.c
+++ b/examples/stop.c
@@ -5,7 +5,7 @@
 #include <linux/kernel.h> /* We are doing kernel work */
 #include <linux/module.h> /* Specifically, a module  */
 
-void cleanup_module()
+void cleanup_module(void)
 {
     pr_info("Short is the life of a kernel module\n");
 }

diff --git a/examples/syscall.c b/examples/syscall.c
index 5b6e45c4cc3e832f937578c4a965853c51e897ed..e8071adfea0fee0d49aecfec6a8f39bcf699656a 100644 (file)
--- a/examples/syscall.c
+++ b/examples/syscall.c
@@ -59,7 +59,7 @@ module_param(sym, ulong, 0644);
 
 #endif /* Version < v5.7 */
 
-unsigned long **sys_call_table;
+static unsigned long **sys_call_table;
 
 /* UID we want to spy on - will be filled from the command line. */
 static int uid;
@@ -75,7 +75,7 @@ module_param(uid, int, 0644);
  * Another reason for this is that we can not get sys_open.
  * It is a static variable, so it is not exported.
  */
-asmlinkage int (*original_call)(const char *, int, int);
+static asmlinkage int (*original_call)(const char *, int, int);
 
 /* The function we will replace sys_open (the function called when you
  * call the open system call) with. To find the exact prototype, with
@@ -87,7 +87,7 @@ asmlinkage int (*original_call)(const char *, int, int);
  * wreck havoc and require programs to be recompiled, since the system
  * calls are the interface between the kernel and the processes).
  */
-asmlinkage int our_sys_open(const char *filename, int flags, int mode)
+static asmlinkage int our_sys_open(const char *filename, int flags, int mode)
 {
     int i = 0;
     char ch;
@@ -95,7 +95,7 @@ asmlinkage int our_sys_open(const char *filename, int flags, int mode)
     /* Report the file, if relevant */
     pr_info("Opened file by %d: ", uid);
     do {
-        get_user(ch, filename + i);
+        get_user(ch, (char __user *)filename + i);
         i++;
         pr_info("%c", ch);
     } while (ch != 0);