[v2] kni: fix ioctl signature
Checks
Commit Message
From: Markus Theil <markus.theil@secunet.com>
Fix kni's ioctl signature to correctly match the kernel's
structs. This shaves off the (void*) casts and uses struct file*
instead of struct inode*. With the correct signature, control flow
integrity checkers are no longer confused at this point.
Signed-off-by: Markus Theil <markus.theil@secunet.com>
Tested-by: Michael Pfeiffer <michael.pfeiffer@tu-ilmenau.de>
---
v2: adapt to suggestions from Ferruh Yigit
kernel/linux/kni/kni_misc.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
Comments
On Sun, 28 Nov 2021 14:14:26 +0100
Markus Theil <markus.theil@tu-ilmenau.de> wrote:
> From: Markus Theil <markus.theil@secunet.com>
>
> Fix kni's ioctl signature to correctly match the kernel's
> structs. This shaves off the (void*) casts and uses struct file*
> instead of struct inode*. With the correct signature, control flow
> integrity checkers are no longer confused at this point.
>
> Signed-off-by: Markus Theil <markus.theil@secunet.com>
> Tested-by: Michael Pfeiffer <michael.pfeiffer@tu-ilmenau.de>
> ---
> v2: adapt to suggestions from Ferruh Yigit
>
> kernel/linux/kni/kni_misc.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
> -static int
> -kni_compat_ioctl(struct inode *inode, uint32_t ioctl_num,
> +static long
> +kni_compat_ioctl(struct file *file, uint32_t ioctl_num,
> unsigned long ioctl_param)
> {
Shouldn't be uint32_t should be unsigned int.
In fs.h.
long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
@@ -482,10 +482,10 @@ kni_ioctl_release(struct net *net, uint32_t ioctl_num,
return ret;
}
-static int
-kni_ioctl(struct inode *inode, uint32_t ioctl_num, unsigned long ioctl_param)
+static long
+kni_ioctl(struct file *file, uint32_t ioctl_num, unsigned long ioctl_param)
{
- int ret = -EINVAL;
+ long ret = -EINVAL;
struct net *net = current->nsproxy->net_ns;
pr_debug("IOCTL num=0x%0x param=0x%0lx\n", ioctl_num, ioctl_param);
@@ -511,8 +511,8 @@ kni_ioctl(struct inode *inode, uint32_t ioctl_num, unsigned long ioctl_param)
return ret;
}
-static int
-kni_compat_ioctl(struct inode *inode, uint32_t ioctl_num,
+static long
+kni_compat_ioctl(struct file *file, uint32_t ioctl_num,
unsigned long ioctl_param)
{
/* 32 bits app on 64 bits OS to be supported later */
@@ -525,8 +525,8 @@ static const struct file_operations kni_fops = {
.owner = THIS_MODULE,
.open = kni_open,
.release = kni_release,
- .unlocked_ioctl = (void *)kni_ioctl,
- .compat_ioctl = (void *)kni_compat_ioctl,
+ .unlocked_ioctl = kni_ioctl,
+ .compat_ioctl = kni_compat_ioctl,
};
static struct miscdevice kni_misc = {