linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 6/6 v2] crypto:s5p-sss: validate iv before memcpy
@ 2014-01-09  5:00 Naveen Krishna Chatradhi
  2014-01-10 11:45 ` [PATCH 7/8 v3] " Naveen Krishna Chatradhi
                   ` (4 more replies)
  0 siblings, 5 replies; 13+ messages in thread
From: Naveen Krishna Chatradhi @ 2014-01-09  5:00 UTC (permalink / raw)
  To: linux-crypto, linux-samsung-soc
  Cc: linux-kernel, vzapolskiy, herbert, naveenkrishna.ch, cpgs, tomasz.figa

This patch adds code to validate "iv" buffer before trying to
memcpy the contents

Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
---
Changes since v1:
None

 drivers/crypto/s5p-sss.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c
index 7c31a5f..220f123 100644
--- a/drivers/crypto/s5p-sss.c
+++ b/drivers/crypto/s5p-sss.c
@@ -398,8 +398,9 @@ static void s5p_set_aes(struct s5p_aes_dev *dev,
 	struct samsung_aes_varient *var = dev->varient;
 	void __iomem *keystart;
 
-	memcpy(dev->ioaddr + SSS_REG_AES_IV_DATA
-				(var->aes_offset, 0), iv, 0x10);
+	if (iv)
+		memcpy(dev->ioaddr + SSS_REG_AES_IV_DATA
+					(var->aes_offset, 0), iv, 0x10);
 
 	if (keylen == AES_KEYSIZE_256)
 		keystart = dev->ioaddr +
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 7/8 v3] crypto:s5p-sss: validate iv before memcpy
  2014-01-09  5:00 [PATCH 6/6 v2] crypto:s5p-sss: validate iv before memcpy Naveen Krishna Chatradhi
@ 2014-01-10 11:45 ` Naveen Krishna Chatradhi
  2014-01-10 16:03   ` Tomasz Figa
  2014-01-15  9:16 ` [PATCH 6/8 v4] ARM: dts: exynos5250/5420: add dt node for sss module Naveen Krishna Chatradhi
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 13+ messages in thread
From: Naveen Krishna Chatradhi @ 2014-01-10 11:45 UTC (permalink / raw)
  To: linux-crypto, linux-samsung-soc
  Cc: linux-kernel, vzapolskiy, herbert, naveenkrishna.ch, cpgs, tomasz.figa

This patch adds code to validate "iv" buffer before trying to
memcpy the contents

Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
---
Changes since v2:
None

 drivers/crypto/s5p-sss.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c
index f274f5f..7058bb6 100644
--- a/drivers/crypto/s5p-sss.c
+++ b/drivers/crypto/s5p-sss.c
@@ -381,8 +381,9 @@ static void s5p_set_aes(struct s5p_aes_dev *dev,
 	struct samsung_aes_variant *var = dev->variant;
 	void __iomem *keystart;
 
-	memcpy(dev->ioaddr + SSS_REG_AES_IV_DATA
-				(var->aes_offset, 0), iv, 0x10);
+	if (iv)
+		memcpy(dev->ioaddr + SSS_REG_AES_IV_DATA
+					(var->aes_offset, 0), iv, 0x10);
 
 	if (keylen == AES_KEYSIZE_256)
 		keystart = dev->ioaddr +
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [PATCH 7/8 v3] crypto:s5p-sss: validate iv before memcpy
  2014-01-10 11:45 ` [PATCH 7/8 v3] " Naveen Krishna Chatradhi
@ 2014-01-10 16:03   ` Tomasz Figa
  2014-01-15  6:45     ` Naveen Krishna Ch
  0 siblings, 1 reply; 13+ messages in thread
From: Tomasz Figa @ 2014-01-10 16:03 UTC (permalink / raw)
  To: Naveen Krishna Chatradhi, linux-crypto, linux-samsung-soc
  Cc: linux-kernel, vzapolskiy, herbert, naveenkrishna.ch, cpgs, tomasz.figa

Hi Naveen,

On 10.01.2014 12:45, Naveen Krishna Chatradhi wrote:
> This patch adds code to validate "iv" buffer before trying to
> memcpy the contents
>
> Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
> ---
> Changes since v2:
> None
>
>   drivers/crypto/s5p-sss.c |    5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c
> index f274f5f..7058bb6 100644
> --- a/drivers/crypto/s5p-sss.c
> +++ b/drivers/crypto/s5p-sss.c
> @@ -381,8 +381,9 @@ static void s5p_set_aes(struct s5p_aes_dev *dev,
>   	struct samsung_aes_variant *var = dev->variant;
>   	void __iomem *keystart;
>
> -	memcpy(dev->ioaddr + SSS_REG_AES_IV_DATA
> -				(var->aes_offset, 0), iv, 0x10);
> +	if (iv)
> +		memcpy(dev->ioaddr + SSS_REG_AES_IV_DATA
> +					(var->aes_offset, 0), iv, 0x10);

In what conditions can the iv end up being NULL?

Best regards,
Tomasz

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 7/8 v3] crypto:s5p-sss: validate iv before memcpy
  2014-01-10 16:03   ` Tomasz Figa
@ 2014-01-15  6:45     ` Naveen Krishna Ch
  0 siblings, 0 replies; 13+ messages in thread
From: Naveen Krishna Ch @ 2014-01-15  6:45 UTC (permalink / raw)
  To: Tomasz Figa
  Cc: Naveen Krishna Chatradhi, linux-crypto, linux-samsung-soc,
	linux-kernel, Vladimir Zapolskiy, herbert, cpgs, tomasz.figa

Hello Tomasz,

On 10 January 2014 21:33, Tomasz Figa <t.figa@samsung.com> wrote:
> Hi Naveen,
>
>
> On 10.01.2014 12:45, Naveen Krishna Chatradhi wrote:
>>
>> This patch adds code to validate "iv" buffer before trying to
>> memcpy the contents
>>
>> Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
>> ---
>> Changes since v2:
>> None
>>
>>   drivers/crypto/s5p-sss.c |    5 +++--
>>   1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c
>> index f274f5f..7058bb6 100644
>> --- a/drivers/crypto/s5p-sss.c
>> +++ b/drivers/crypto/s5p-sss.c
>> @@ -381,8 +381,9 @@ static void s5p_set_aes(struct s5p_aes_dev *dev,
>>         struct samsung_aes_variant *var = dev->variant;
>>         void __iomem *keystart;
>>
>> -       memcpy(dev->ioaddr + SSS_REG_AES_IV_DATA
>> -                               (var->aes_offset, 0), iv, 0x10);
>> +       if (iv)
>> +               memcpy(dev->ioaddr + SSS_REG_AES_IV_DATA
>> +                                       (var->aes_offset, 0), iv, 0x10);
>
>
> In what conditions can the iv end up being NULL?
req->info is the initialization vector in our case, which comes from user space.
Its good to have a check to avoid any crashes.

Also AES ECB mode does not use IV.
>
> Best regards,
> Tomasz



-- 
Shine bright,
(: Nav :)

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH 6/8 v4] ARM: dts: exynos5250/5420: add dt node for sss module
  2014-01-09  5:00 [PATCH 6/6 v2] crypto:s5p-sss: validate iv before memcpy Naveen Krishna Chatradhi
  2014-01-10 11:45 ` [PATCH 7/8 v3] " Naveen Krishna Chatradhi
@ 2014-01-15  9:16 ` Naveen Krishna Chatradhi
  2014-01-23 10:19   ` Naveen Krishna Ch
                     ` (2 more replies)
  2014-01-15  9:17 ` [PATCH 7/8 v4] crypto:s5p-sss: validate iv before memcpy Naveen Krishna Chatradhi
                   ` (2 subsequent siblings)
  4 siblings, 3 replies; 13+ messages in thread
From: Naveen Krishna Chatradhi @ 2014-01-15  9:16 UTC (permalink / raw)
  To: linux-crypto, linux-samsung-soc
  Cc: linux-kernel, vzapolskiy, herbert, naveenkrishna.ch, cpgs,
	tomasz.figa, Kukjin Kim

This patch adds the device tree node for SSS module
found on Exynos5420 and Exynos5250

Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
TO: <linux-samsung-soc@vger.kernel.org>
CC: Kukjin Kim <kgene.kim@samsung.com>
CC: <linux-crypto@vger.kernel.org>
---
Changes since v3:
1. Modified the SSS clock ID as per dt-bindings for Exynos5250 in
   samsung-clk.git tree.

 arch/arm/boot/dts/exynos5250.dtsi |    8 ++++++++
 arch/arm/boot/dts/exynos5420.dtsi |   10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index c341e55..1d249df 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -704,4 +704,12 @@
 		io-channel-ranges;
 		status = "disabled";
 	};
+
+	sss@10830000 {
+		compatible = "samsung,exynos4210-secss";
+		reg = <0x10830000 0x10000>;
+		interrupts = <0 112 0>;
+		clocks = <&clock 348>;
+		clock-names = "secss";
+	};
 };
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 11dd202..56a3f3e 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -652,4 +652,14 @@
 		clocks = <&clock 319>, <&clock 318>;
 		clock-names = "tmu_apbif", "tmu_triminfo_apbif";
 	};
+
+	sss@10830000 {
+		compatible = "samsung,exynos4210-secss";
+		reg = <0x10830000 0x10000>;
+		interrupts = <0 112 0>;
+		clocks = <&clock 471>;
+		clock-names = "secss";
+		samsung,power-domain = <&g2d_pd>;
+	};
+
 };
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 7/8 v4] crypto:s5p-sss: validate iv before memcpy
  2014-01-09  5:00 [PATCH 6/6 v2] crypto:s5p-sss: validate iv before memcpy Naveen Krishna Chatradhi
  2014-01-10 11:45 ` [PATCH 7/8 v3] " Naveen Krishna Chatradhi
  2014-01-15  9:16 ` [PATCH 6/8 v4] ARM: dts: exynos5250/5420: add dt node for sss module Naveen Krishna Chatradhi
@ 2014-01-15  9:17 ` Naveen Krishna Chatradhi
  2014-01-23 10:18   ` Naveen Krishna Ch
  2014-01-24 15:52   ` Tomasz Figa
  2014-01-29  9:25 ` [PATCH 7/9 v5] " Naveen Krishna Chatradhi
  2014-02-07  5:25 ` [PATCH 7/9 v6] " Naveen Krishna Chatradhi
  4 siblings, 2 replies; 13+ messages in thread
From: Naveen Krishna Chatradhi @ 2014-01-15  9:17 UTC (permalink / raw)
  To: linux-crypto, linux-samsung-soc
  Cc: linux-kernel, vzapolskiy, herbert, naveenkrishna.ch, cpgs, tomasz.figa

This patch adds code to validate "iv" buffer before trying to
memcpy the contents

Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
---
Changes since v3:
None

 drivers/crypto/s5p-sss.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c
index 69130b2..f7c66c7 100644
--- a/drivers/crypto/s5p-sss.c
+++ b/drivers/crypto/s5p-sss.c
@@ -380,7 +380,8 @@ static void s5p_set_aes(struct s5p_aes_dev *dev,
 {
 	void __iomem *keystart;
 
-	memcpy(dev->aes_ioaddr + SSS_REG_AES_IV_DATA (0), iv, 0x10);
+	if (iv)
+		memcpy(dev->aes_ioaddr + SSS_REG_AES_IV_DATA (0), iv, 0x10);
 
 	if (keylen == AES_KEYSIZE_256)
 		keystart = dev->aes_ioaddr + SSS_REG_AES_KEY_DATA(0);
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [PATCH 7/8 v4] crypto:s5p-sss: validate iv before memcpy
  2014-01-15  9:17 ` [PATCH 7/8 v4] crypto:s5p-sss: validate iv before memcpy Naveen Krishna Chatradhi
@ 2014-01-23 10:18   ` Naveen Krishna Ch
  2014-01-24 15:52   ` Tomasz Figa
  1 sibling, 0 replies; 13+ messages in thread
From: Naveen Krishna Ch @ 2014-01-23 10:18 UTC (permalink / raw)
  To: Naveen Krishna Chatradhi
  Cc: linux-crypto, linux-samsung-soc, linux-kernel,
	Vladimir Zapolskiy, herbert, cpgs, tomasz.figa

Hello All,

On 15 January 2014 14:47, Naveen Krishna Chatradhi
<ch.naveen@samsung.com> wrote:
> This patch adds code to validate "iv" buffer before trying to
> memcpy the contents
>
> Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
> ---
> Changes since v3:
> None
>
>  drivers/crypto/s5p-sss.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c
> index 69130b2..f7c66c7 100644
> --- a/drivers/crypto/s5p-sss.c
> +++ b/drivers/crypto/s5p-sss.c
> @@ -380,7 +380,8 @@ static void s5p_set_aes(struct s5p_aes_dev *dev,
>  {
>         void __iomem *keystart;
>
> -       memcpy(dev->aes_ioaddr + SSS_REG_AES_IV_DATA (0), iv, 0x10);
> +       if (iv)
> +               memcpy(dev->aes_ioaddr + SSS_REG_AES_IV_DATA (0), iv, 0x10);
>
>         if (keylen == AES_KEYSIZE_256)
>                 keystart = dev->aes_ioaddr + SSS_REG_AES_KEY_DATA(0);
> --
> 1.7.9.5
Any update on this patch, Please
>



-- 
Shine bright,
(: Nav :)

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 6/8 v4] ARM: dts: exynos5250/5420: add dt node for sss module
  2014-01-15  9:16 ` [PATCH 6/8 v4] ARM: dts: exynos5250/5420: add dt node for sss module Naveen Krishna Chatradhi
@ 2014-01-23 10:19   ` Naveen Krishna Ch
  2014-01-24 15:36   ` Tomasz Figa
  2014-01-29  9:24   ` [PATCH 6/9 v5] " Naveen Krishna Chatradhi
  2 siblings, 0 replies; 13+ messages in thread
From: Naveen Krishna Ch @ 2014-01-23 10:19 UTC (permalink / raw)
  To: Naveen Krishna Chatradhi
  Cc: linux-crypto, linux-samsung-soc, linux-kernel,
	Vladimir Zapolskiy, herbert, cpgs, tomasz.figa, Kukjin Kim

Hello All,

On 15 January 2014 14:46, Naveen Krishna Chatradhi
<ch.naveen@samsung.com> wrote:
> This patch adds the device tree node for SSS module
> found on Exynos5420 and Exynos5250
>
> Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
> Reviewed-by: Tomasz Figa <t.figa@samsung.com>
> TO: <linux-samsung-soc@vger.kernel.org>
> CC: Kukjin Kim <kgene.kim@samsung.com>
> CC: <linux-crypto@vger.kernel.org>
> ---
> Changes since v3:
> 1. Modified the SSS clock ID as per dt-bindings for Exynos5250 in
>    samsung-clk.git tree.
>
>  arch/arm/boot/dts/exynos5250.dtsi |    8 ++++++++
>  arch/arm/boot/dts/exynos5420.dtsi |   10 ++++++++++
>  2 files changed, 18 insertions(+)
>
> diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
> index c341e55..1d249df 100644
> --- a/arch/arm/boot/dts/exynos5250.dtsi
> +++ b/arch/arm/boot/dts/exynos5250.dtsi
> @@ -704,4 +704,12 @@
>                 io-channel-ranges;
>                 status = "disabled";
>         };
> +
> +       sss@10830000 {
> +               compatible = "samsung,exynos4210-secss";
> +               reg = <0x10830000 0x10000>;
> +               interrupts = <0 112 0>;
> +               clocks = <&clock 348>;
> +               clock-names = "secss";
> +       };
>  };
> diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
> index 11dd202..56a3f3e 100644
> --- a/arch/arm/boot/dts/exynos5420.dtsi
> +++ b/arch/arm/boot/dts/exynos5420.dtsi
> @@ -652,4 +652,14 @@
>                 clocks = <&clock 319>, <&clock 318>;
>                 clock-names = "tmu_apbif", "tmu_triminfo_apbif";
>         };
> +
> +       sss@10830000 {
> +               compatible = "samsung,exynos4210-secss";
> +               reg = <0x10830000 0x10000>;
> +               interrupts = <0 112 0>;
> +               clocks = <&clock 471>;
> +               clock-names = "secss";
> +               samsung,power-domain = <&g2d_pd>;
> +       };
> +
>  };
> --
> 1.7.9.5
Any update on this patch, Please
>



-- 
Shine bright,
(: Nav :)

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 6/8 v4] ARM: dts: exynos5250/5420: add dt node for sss module
  2014-01-15  9:16 ` [PATCH 6/8 v4] ARM: dts: exynos5250/5420: add dt node for sss module Naveen Krishna Chatradhi
  2014-01-23 10:19   ` Naveen Krishna Ch
@ 2014-01-24 15:36   ` Tomasz Figa
  2014-01-29  9:24   ` [PATCH 6/9 v5] " Naveen Krishna Chatradhi
  2 siblings, 0 replies; 13+ messages in thread
From: Tomasz Figa @ 2014-01-24 15:36 UTC (permalink / raw)
  To: Naveen Krishna Chatradhi, linux-crypto, linux-samsung-soc
  Cc: linux-kernel, vzapolskiy, herbert, naveenkrishna.ch, cpgs,
	tomasz.figa, Kukjin Kim

Hi Naveen,

On 15.01.2014 10:16, Naveen Krishna Chatradhi wrote:
> This patch adds the device tree node for SSS module
> found on Exynos5420 and Exynos5250
>
> Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
> Reviewed-by: Tomasz Figa <t.figa@samsung.com>
> TO: <linux-samsung-soc@vger.kernel.org>
> CC: Kukjin Kim <kgene.kim@samsung.com>
> CC: <linux-crypto@vger.kernel.org>
> ---
> Changes since v3:
> 1. Modified the SSS clock ID as per dt-bindings for Exynos5250 in
>     samsung-clk.git tree.
>
>   arch/arm/boot/dts/exynos5250.dtsi |    8 ++++++++
>   arch/arm/boot/dts/exynos5420.dtsi |   10 ++++++++++
>   2 files changed, 18 insertions(+)

Reviewed-by: Tomasz Figa <t.figa@samsung.com>

Best regards,
Tomasz


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 7/8 v4] crypto:s5p-sss: validate iv before memcpy
  2014-01-15  9:17 ` [PATCH 7/8 v4] crypto:s5p-sss: validate iv before memcpy Naveen Krishna Chatradhi
  2014-01-23 10:18   ` Naveen Krishna Ch
@ 2014-01-24 15:52   ` Tomasz Figa
  1 sibling, 0 replies; 13+ messages in thread
From: Tomasz Figa @ 2014-01-24 15:52 UTC (permalink / raw)
  To: Naveen Krishna Chatradhi, linux-crypto, linux-samsung-soc
  Cc: linux-kernel, vzapolskiy, herbert, naveenkrishna.ch, cpgs, tomasz.figa

On 15.01.2014 10:17, Naveen Krishna Chatradhi wrote:
> This patch adds code to validate "iv" buffer before trying to
> memcpy the contents
>
> Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
> ---
> Changes since v3:
> None
>
>   drivers/crypto/s5p-sss.c |    3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

Reviewed-by: Tomasz Figa <t.figa@samsung.com>

Best regards,
Tomasz

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH 6/9 v5] ARM: dts: exynos5250/5420: add dt node for sss module
  2014-01-15  9:16 ` [PATCH 6/8 v4] ARM: dts: exynos5250/5420: add dt node for sss module Naveen Krishna Chatradhi
  2014-01-23 10:19   ` Naveen Krishna Ch
  2014-01-24 15:36   ` Tomasz Figa
@ 2014-01-29  9:24   ` Naveen Krishna Chatradhi
  2 siblings, 0 replies; 13+ messages in thread
From: Naveen Krishna Chatradhi @ 2014-01-29  9:24 UTC (permalink / raw)
  To: linux-crypto, linux-samsung-soc
  Cc: linux-kernel, vzapolskiy, herbert, naveenkrishna.ch, cpgs,
	devicetree, Kukjin Kim

This patch adds the device tree node for SSS module
found on Exynos5420 and Exynos5250

Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
TO: <linux-samsung-soc@vger.kernel.org>
CC: Kukjin Kim <kgene.kim@samsung.com>
CC: <linux-crypto@vger.kernel.org>
---
Changes since v4:
None
Changes since v3:
1. Modified the SSS clock ID as per dt-bindings for Exynos5250 in
   samsung-clk.git tree.

 arch/arm/boot/dts/exynos5250.dtsi |    8 ++++++++
 arch/arm/boot/dts/exynos5420.dtsi |   10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index c341e55..1d249df 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -704,4 +704,12 @@
 		io-channel-ranges;
 		status = "disabled";
 	};
+
+	sss@10830000 {
+		compatible = "samsung,exynos4210-secss";
+		reg = <0x10830000 0x10000>;
+		interrupts = <0 112 0>;
+		clocks = <&clock 348>;
+		clock-names = "secss";
+	};
 };
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 11dd202..56a3f3e 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -652,4 +652,14 @@
 		clocks = <&clock 319>, <&clock 318>;
 		clock-names = "tmu_apbif", "tmu_triminfo_apbif";
 	};
+
+	sss@10830000 {
+		compatible = "samsung,exynos4210-secss";
+		reg = <0x10830000 0x10000>;
+		interrupts = <0 112 0>;
+		clocks = <&clock 471>;
+		clock-names = "secss";
+		samsung,power-domain = <&g2d_pd>;
+	};
+
 };
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 7/9 v5] crypto:s5p-sss: validate iv before memcpy
  2014-01-09  5:00 [PATCH 6/6 v2] crypto:s5p-sss: validate iv before memcpy Naveen Krishna Chatradhi
                   ` (2 preceding siblings ...)
  2014-01-15  9:17 ` [PATCH 7/8 v4] crypto:s5p-sss: validate iv before memcpy Naveen Krishna Chatradhi
@ 2014-01-29  9:25 ` Naveen Krishna Chatradhi
  2014-02-07  5:25 ` [PATCH 7/9 v6] " Naveen Krishna Chatradhi
  4 siblings, 0 replies; 13+ messages in thread
From: Naveen Krishna Chatradhi @ 2014-01-29  9:25 UTC (permalink / raw)
  To: linux-crypto, linux-samsung-soc
  Cc: linux-kernel, vzapolskiy, herbert, naveenkrishna.ch, cpgs, devicetree

This patch adds code to validate "iv" buffer before trying to
memcpy the contents

Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
---
Changes since v4:
None

Changes since v3:
None

 drivers/crypto/s5p-sss.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c
index da1c8943..a890273 100644
--- a/drivers/crypto/s5p-sss.c
+++ b/drivers/crypto/s5p-sss.c
@@ -380,7 +380,8 @@ static void s5p_set_aes(struct s5p_aes_dev *dev,
 {
 	void __iomem *keystart;
 
-	memcpy(dev->aes_ioaddr + SSS_REG_AES_IV_DATA (0), iv, 0x10);
+	if (iv)
+		memcpy(dev->aes_ioaddr + SSS_REG_AES_IV_DATA (0), iv, 0x10);
 
 	if (keylen == AES_KEYSIZE_256)
 		keystart = dev->aes_ioaddr + SSS_REG_AES_KEY_DATA(0);
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 7/9 v6] crypto:s5p-sss: validate iv before memcpy
  2014-01-09  5:00 [PATCH 6/6 v2] crypto:s5p-sss: validate iv before memcpy Naveen Krishna Chatradhi
                   ` (3 preceding siblings ...)
  2014-01-29  9:25 ` [PATCH 7/9 v5] " Naveen Krishna Chatradhi
@ 2014-02-07  5:25 ` Naveen Krishna Chatradhi
  4 siblings, 0 replies; 13+ messages in thread
From: Naveen Krishna Chatradhi @ 2014-02-07  5:25 UTC (permalink / raw)
  To: linux-crypto, linux-samsung-soc
  Cc: linux-kernel, vzapolskiy, herbert, naveenkrishna.ch, cpgs

This patch adds code to validate "iv" buffer before trying to
memcpy the contents

Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
---
changes since v5:
None

 drivers/crypto/s5p-sss.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/s5p-sss.c b/drivers/crypto/s5p-sss.c
index da1c8943..a890273 100644
--- a/drivers/crypto/s5p-sss.c
+++ b/drivers/crypto/s5p-sss.c
@@ -380,7 +380,8 @@ static void s5p_set_aes(struct s5p_aes_dev *dev,
 {
 	void __iomem *keystart;
 
-	memcpy(dev->aes_ioaddr + SSS_REG_AES_IV_DATA (0), iv, 0x10);
+	if (iv)
+		memcpy(dev->aes_ioaddr + SSS_REG_AES_IV_DATA (0), iv, 0x10);
 
 	if (keylen == AES_KEYSIZE_256)
 		keystart = dev->aes_ioaddr + SSS_REG_AES_KEY_DATA(0);
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2014-02-07  5:25 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-09  5:00 [PATCH 6/6 v2] crypto:s5p-sss: validate iv before memcpy Naveen Krishna Chatradhi
2014-01-10 11:45 ` [PATCH 7/8 v3] " Naveen Krishna Chatradhi
2014-01-10 16:03   ` Tomasz Figa
2014-01-15  6:45     ` Naveen Krishna Ch
2014-01-15  9:16 ` [PATCH 6/8 v4] ARM: dts: exynos5250/5420: add dt node for sss module Naveen Krishna Chatradhi
2014-01-23 10:19   ` Naveen Krishna Ch
2014-01-24 15:36   ` Tomasz Figa
2014-01-29  9:24   ` [PATCH 6/9 v5] " Naveen Krishna Chatradhi
2014-01-15  9:17 ` [PATCH 7/8 v4] crypto:s5p-sss: validate iv before memcpy Naveen Krishna Chatradhi
2014-01-23 10:18   ` Naveen Krishna Ch
2014-01-24 15:52   ` Tomasz Figa
2014-01-29  9:25 ` [PATCH 7/9 v5] " Naveen Krishna Chatradhi
2014-02-07  5:25 ` [PATCH 7/9 v6] " Naveen Krishna Chatradhi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).