Security fixes for sunxi legacy kernels

UMP patch for sun8i
This commit is contained in:
zador-blood-stained 2016-07-16 00:54:06 +03:00
parent f4d78e0c2e
commit 70d0a6facc
5 changed files with 199 additions and 0 deletions

View File

@ -0,0 +1,43 @@
From 6964d467510849e3e262518cb87bff7ef92e01f5 Mon Sep 17 00:00:00 2001
From: yangcaoyuan <yangcaoyuan@allwinnertech.com>
Date: Mon, 11 Jul 2016 10:23:00 +0800
Subject: [PATCH] driver:cedar-ve delete non_secure code
Change-Id: I6ca0037ea3decd13bb4ab854081f6ae4c576bd47
---
drivers/media/cedar-ve/cedar_ve.c | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/drivers/media/cedar-ve/cedar_ve.c b/drivers/media/cedar-ve/cedar_ve.c
index 0c1be78..a2f4bec 100755
--- a/drivers/media/cedar-ve/cedar_ve.c
+++ b/drivers/media/cedar-ve/cedar_ve.c
@@ -744,28 +744,7 @@ long cedardev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
case IOCTL_GET_IC_VER:
{
return 0;
- }
- case IOCTL_READ_REG:
- {
- struct cedarv_regop reg_para;
- if(copy_from_user(&reg_para, (void __user*)arg, sizeof(struct cedarv_regop)))
- {
- return -EFAULT;
- }
- return readl(reg_para.addr);
- }
-
- case IOCTL_WRITE_REG:
- {
- struct cedarv_regop reg_para;
- if(copy_from_user(&reg_para, (void __user*)arg, sizeof(struct cedarv_regop)))
- {
- return -EFAULT;
- }
- writel(reg_para.value, reg_para.addr);
- break;
}
- break;
case IOCTL_SET_REFCOUNT:
cedar_devp->ref_count = (int)arg;
break;

View File

@ -0,0 +1,43 @@
From 6964d467510849e3e262518cb87bff7ef92e01f5 Mon Sep 17 00:00:00 2001
From: yangcaoyuan <yangcaoyuan@allwinnertech.com>
Date: Mon, 11 Jul 2016 10:23:00 +0800
Subject: [PATCH] driver:cedar-ve delete non_secure code
Change-Id: I6ca0037ea3decd13bb4ab854081f6ae4c576bd47
---
drivers/media/cedar-ve/cedar_ve.c | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/drivers/media/cedar-ve/cedar_ve.c b/drivers/media/cedar-ve/cedar_ve.c
index 0c1be78..a2f4bec 100755
--- a/drivers/media/cedar-ve/cedar_ve.c
+++ b/drivers/media/cedar-ve/cedar_ve.c
@@ -744,28 +744,7 @@ long cedardev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
case IOCTL_GET_IC_VER:
{
return 0;
- }
- case IOCTL_READ_REG:
- {
- struct cedarv_regop reg_para;
- if(copy_from_user(&reg_para, (void __user*)arg, sizeof(struct cedarv_regop)))
- {
- return -EFAULT;
- }
- return readl(reg_para.addr);
- }
-
- case IOCTL_WRITE_REG:
- {
- struct cedarv_regop reg_para;
- if(copy_from_user(&reg_para, (void __user*)arg, sizeof(struct cedarv_regop)))
- {
- return -EFAULT;
- }
- writel(reg_para.value, reg_para.addr);
- break;
}
- break;
case IOCTL_SET_REFCOUNT:
cedar_devp->ref_count = (int)arg;
break;

View File

@ -0,0 +1,43 @@
From 6964d467510849e3e262518cb87bff7ef92e01f5 Mon Sep 17 00:00:00 2001
From: yangcaoyuan <yangcaoyuan@allwinnertech.com>
Date: Mon, 11 Jul 2016 10:23:00 +0800
Subject: [PATCH] driver:cedar-ve delete non_secure code
Change-Id: I6ca0037ea3decd13bb4ab854081f6ae4c576bd47
---
drivers/media/cedar-ve/cedar_ve.c | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/drivers/media/cedar-ve/cedar_ve.c b/drivers/media/cedar-ve/cedar_ve.c
index 0c1be78..a2f4bec 100755
--- a/drivers/media/cedar-ve/cedar_ve.c
+++ b/drivers/media/cedar-ve/cedar_ve.c
@@ -744,28 +744,7 @@ long cedardev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
case IOCTL_GET_IC_VER:
{
return 0;
- }
- case IOCTL_READ_REG:
- {
- struct cedarv_regop reg_para;
- if(copy_from_user(&reg_para, (void __user*)arg, sizeof(struct cedarv_regop)))
- {
- return -EFAULT;
- }
- return readl(reg_para.addr);
- }
-
- case IOCTL_WRITE_REG:
- {
- struct cedarv_regop reg_para;
- if(copy_from_user(&reg_para, (void __user*)arg, sizeof(struct cedarv_regop)))
- {
- return -EFAULT;
- }
- writel(reg_para.value, reg_para.addr);
- break;
}
- break;
case IOCTL_SET_REFCOUNT:
cedar_devp->ref_count = (int)arg;
break;

View File

@ -0,0 +1,27 @@
From ab2ccc6f757c7c49f84a719584b4dde5da431394 Mon Sep 17 00:00:00 2001
From: Andreas Baierl <ichgeh@imkreisrum.de>
Date: Tue, 8 Mar 2016 11:07:58 -0500
Subject: [PATCH] Fix ump build
---
arch/arm/mach-sunxi/include/mach/sun8i/memory-sun8iw7p1.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/mach-sunxi/include/mach/sun8i/memory-sun8iw7p1.h b/arch/arm/mach-sunxi/include/mach/sun8i/memory-sun8iw7p1.h
index afa1202..02c7429 100755
--- a/arch/arm/mach-sunxi/include/mach/sun8i/memory-sun8iw7p1.h
+++ b/arch/arm/mach-sunxi/include/mach/sun8i/memory-sun8iw7p1.h
@@ -18,6 +18,10 @@
#define __MEMORY_SUN8I_W5P1_H
#define PLAT_PHYS_OFFSET UL(0x40000000)
+#define __phys_to_bus(x) ((u32)(x) < PLAT_PHYS_OFFSET ? (x) : \
+ (x) - PLAT_PHYS_OFFSET)
+#define __bus_to_phys(x) ((x) + PLAT_PHYS_OFFSET)
+
#ifdef CONFIG_EVB_PLATFORM
#define PLAT_MEM_SIZE SZ_2G
#else
--
2.7.0

View File

@ -0,0 +1,43 @@
From 6964d467510849e3e262518cb87bff7ef92e01f5 Mon Sep 17 00:00:00 2001
From: yangcaoyuan <yangcaoyuan@allwinnertech.com>
Date: Mon, 11 Jul 2016 10:23:00 +0800
Subject: [PATCH] driver:cedar-ve delete non_secure code
Change-Id: I6ca0037ea3decd13bb4ab854081f6ae4c576bd47
---
drivers/media/cedar-ve/cedar_ve.c | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/drivers/media/cedar-ve/cedar_ve.c b/drivers/media/cedar-ve/cedar_ve.c
index 0c1be78..a2f4bec 100755
--- a/drivers/media/cedar-ve/cedar_ve.c
+++ b/drivers/media/cedar-ve/cedar_ve.c
@@ -744,28 +744,7 @@ long cedardev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
case IOCTL_GET_IC_VER:
{
return 0;
- }
- case IOCTL_READ_REG:
- {
- struct cedarv_regop reg_para;
- if(copy_from_user(&reg_para, (void __user*)arg, sizeof(struct cedarv_regop)))
- {
- return -EFAULT;
- }
- return readl(reg_para.addr);
- }
-
- case IOCTL_WRITE_REG:
- {
- struct cedarv_regop reg_para;
- if(copy_from_user(&reg_para, (void __user*)arg, sizeof(struct cedarv_regop)))
- {
- return -EFAULT;
- }
- writel(reg_para.value, reg_para.addr);
- break;
}
- break;
case IOCTL_SET_REFCOUNT:
cedar_devp->ref_count = (int)arg;
break;