Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1471432

Re: [PATCH 1/1] ASoC: Intel: Atom: add a missing star in a memcpy call

Show all headers | View raw

On Sun, 2016-08-28 at 19:39 +0200, Nicolas Iooss wrote:
> In sst_prepare_and_post_msg(), when a response is received in "block",
> the following code gets executed:
> 
>     *data = kzalloc(block->size, GFP_KERNEL);
>     memcpy(data, (void *) block->data, block->size);
> 
> The memcpy() call overwrites the content of the *data pointer instead of
> filling the newly-allocated memory (which pointer is hold by *data).
> Fix this by using *data in the memcpy() call.
> 
> Fixes: 60dc8dbacb00 ("ASoC: Intel: sst: Add some helper functions")
> Cc: stable@vger.kernel.org # 3.19.x
> Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
> ---
>  sound/soc/intel/atom/sst/sst_pvt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/soc/intel/atom/sst/sst_pvt.c b/sound/soc/intel/atom/sst/sst_pvt.c
> index adb32fefd693..7c398b7c9d4b 100644
> --- a/sound/soc/intel/atom/sst/sst_pvt.c
> +++ b/sound/soc/intel/atom/sst/sst_pvt.c
> @@ -289,7 +289,7 @@ int sst_prepare_and_post_msg(struct intel_sst_drv *sst,
>  				ret = -ENOMEM;
>  				goto out;
>  			} else
> -				memcpy(data, (void *) block->data, block->size);
> +				memcpy(*data, (void *) block->data, block->size);
>  		}
>  	}
>  out:

Perhaps this would be nicer using kmemdup too
---
 sound/soc/intel/atom/sst/sst_pvt.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/sound/soc/intel/atom/sst/sst_pvt.c b/sound/soc/intel/atom/sst/sst_pvt.c
index adb32fe..b1e6b8f 100644
--- a/sound/soc/intel/atom/sst/sst_pvt.c
+++ b/sound/soc/intel/atom/sst/sst_pvt.c
@@ -279,17 +279,15 @@ int sst_prepare_and_post_msg(struct intel_sst_drv *sst,
 
 	if (response) {
 		ret = sst_wait_timeout(sst, block);
-		if (ret < 0) {
+		if (ret < 0)
 			goto out;
-		} else if(block->data) {
-			if (!data)
-				goto out;
-			*data = kzalloc(block->size, GFP_KERNEL);
-			if (!(*data)) {
+
+		if (data && block->data) {
+			*data = kmemdup(block->data, block->size, GFP_KERNEL);
+			if (!*data) {
 				ret = -ENOMEM;
 				goto out;
-			} else
-				memcpy(data, (void *) block->data, block->size);
+			}
 		}
 	}
 out:

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/1] ASoC: Intel: Atom: add a missing star in a memcpy call Nicolas Iooss <nicolas.iooss_linux@m4x.org> - 2016-08-28 19:50 +0200
  Misuses of ** ? (was Re: [PATCH 1/1] ASoC: Intel: Atom: add a  missing star in a memcpy call) Joe Perches <joe@perches.com> - 2016-08-28 20:00 +0200
    Re: Misuses of ** ? (was Re: [PATCH 1/1] ASoC: Intel: Atom: add a  missing star in a memcpy call) Nicolas Iooss <nicolas.iooss_linux@m4x.org> - 2016-08-28 21:00 +0200
      Re: Misuses of ** ? (was Re: [PATCH 1/1] ASoC: Intel: Atom: add a  missing star in a memcpy call) Julia Lawall <julia.lawall@lip6.fr> - 2016-08-28 21:40 +0200
        Re: Misuses of ** ? (was Re: [PATCH 1/1] ASoC: Intel: Atom: add a  missing star in a memcpy call) Joe Perches <joe@perches.com> - 2016-08-28 22:40 +0200
          Re: Misuses of ** ? (was Re: [PATCH 1/1] ASoC: Intel: Atom: add a  missing star in a memcpy call) Julia Lawall <julia.lawall@lip6.fr> - 2016-08-28 23:50 +0200
            Re: Misuses of ** ? (was Re: [PATCH 1/1] ASoC: Intel: Atom: add a  missing star in a memcpy call) Joe Perches <joe@perches.com> - 2016-08-29 00:00 +0200
  Re: [PATCH 1/1] ASoC: Intel: Atom: add a missing star in a memcpy  call Joe Perches <joe@perches.com> - 2016-08-28 20:20 +0200
    Re: [PATCH 1/1] ASoC: Intel: Atom: add a missing star in a memcpy  call Nicolas Iooss <nicolas.iooss_linux@m4x.org> - 2016-08-28 20:40 +0200

csiph-web