nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

misc: tegra-cec: update access_ok() parameters

Browse Source 
Starting K5.9, the access type parameter (read/write) of
access_ok() API has been removed. And also, the address
parameter has been updated to "void *" type from "unsigned
long". Introduced API tegra_access_ok() to abstract the
difference in parameters across different kernel versions.

bug 200601926

Change-Id: I0d72e03f5e0c56eb935107eaf306bc2d68ed13e3
Signed-off-by: Naveen Kumar S <nkumars@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2361042
Reviewed-by: Shu Zhong <shuz@nvidia.com>
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Arun Swain <arswain@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Naveen Kumar S
2020-06-15 17:01:48 +05:30
committed by Prafull Suryawanshi
parent b36167f31c
commit 80d0f3b9fa
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/misc/tegra-cec/tegra_cec.c
View File

@@ -1,7 +1,7 @@
/*
* drivers/misc/tegra-cec/tegra_cec.c
*
* Copyright (c) 2012-2018, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2012-2020, NVIDIA CORPORATION. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
@@ -361,6 +361,18 @@ static int tegra_cec_get_rx_snoop(struct tegra_cec *cec, u32 *state)
return 0;
}
static int tegra_cec_access_ok(u8 access_type, unsigned long arg, size_t size)
{
int err = 0;
#if KERNEL_VERSION(5, 4, 0) > LINUX_VERSION_CODE
err = !access_ok(access_type, arg, size);
#else
err = !access_ok((void *)arg, size);
#endif
return err;
}
static long tegra_cec_ioctl(struct file *file, unsigned int cmd,
unsigned long arg)
@@ -383,7 +395,7 @@ static long tegra_cec_ioctl(struct file *file, unsigned int cmd,
tegra_cec_dump_registers(cec);
break;
case TEGRA_CEC_IOCTL_SET_RX_SNOOP:
err = !access_ok(VERIFY_READ, arg, sizeof(u32));
err = tegra_cec_access_ok(VERIFY_READ, arg, sizeof(u32));
if (err)
return -EFAULT;
if (copy_from_user((u32 *) &state, (u32 *) arg, sizeof(u32)))
@@ -391,7 +403,7 @@ static long tegra_cec_ioctl(struct file *file, unsigned int cmd,
tegra_cec_set_rx_snoop(cec, state);
break;
case TEGRA_CEC_IOCTL_GET_RX_SNOOP:
err = !access_ok(VERIFY_WRITE, arg, sizeof(u32));
err = tegra_cec_access_ok(VERIFY_READ, arg, sizeof(u32));
if (err)
return -EFAULT;
err = tegra_cec_get_rx_snoop(cec, &state);
@@ -401,7 +413,7 @@ static long tegra_cec_ioctl(struct file *file, unsigned int cmd,
}
break;
case TEGRA_CEC_IOCTL_GET_POST_RECOVERY:
err = !access_ok(VERIFY_WRITE, arg, sizeof(u32));
err = tegra_cec_access_ok(VERIFY_READ, arg, sizeof(u32));
if (err)
return -EFAULT;
if (copy_to_user((bool *) arg, &post_recovery, sizeof(bool)))