From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gary Bisson Date: Thu, 24 Jul 2014 23:43:13 -0700 Subject: [Buildroot] [PATCH] libfslvpuwrap: fix tests of return value from IOGetVirtMem Message-ID: <1406270593-17193-1-git-send-email-bisson.gary@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Same as similar patches for imx-vpu, the returned value from IOGetVirtMem was not properly checked. Signed-off-by: Gary Bisson --- Yann, Eric, all, This patch is just a copy of what Eric pushed for this package in Yocto. Thanks, Gary --- ...-fix-tests-of-return-value-from-IOGetVirt.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/libfslvpuwrap/libfslvpuwrap-0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch diff --git a/package/libfslvpuwrap/libfslvpuwrap-0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch b/package/libfslvpuwrap/libfslvpuwrap-0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch new file mode 100644 index 0000000..ccd2d9e --- /dev/null +++ b/package/libfslvpuwrap/libfslvpuwrap-0001-vpu_wrapper-fix-tests-of-return-value-from-IOGetVirt.patch @@ -0,0 +1,41 @@ +From 7ca66c10c05168c7d342df7c7a70d4a1ae0629f7 Mon Sep 17 00:00:00 2001 +From: Eric Nelson +Date: Sat, 28 Jun 2014 09:45:09 -0700 +Subject: [PATCH] vpu_wrapper: fix tests of return value from IOGetVirtMem + +IOGetVirtMem() returns a pointer or specifically -1 (MAP_FAILED) +in the case of failure. + +Upstream-Status: Pending + +Signed-off-by: Laci Tele +Signed-off-by: Eric Nelson +--- + vpu_wrapper.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/vpu_wrapper.c b/vpu_wrapper.c +index 9249174..148c5df 100755 +--- a/vpu_wrapper.c ++++ b/vpu_wrapper.c +@@ -6653,7 +6653,7 @@ VpuDecRetCode VPU_DecGetMem(VpuMemDesc* pInOutMem) + return VPU_DEC_RET_FAILURE; + } + ret=IOGetVirtMem(&buff); +- if(ret==0) //if(ret!=RETCODE_SUCCESS) ++ if(ret == -1) //if(ret==MAP_FAILED) + { + VPU_ERROR("%s: get virtual memory failure: size=%d, ret=%d \r\n",__FUNCTION__,buff.size,ret); + return VPU_DEC_RET_FAILURE; +@@ -8277,7 +8277,7 @@ VpuEncRetCode VPU_EncGetMem(VpuMemDesc* pInOutMem) + return VPU_ENC_RET_FAILURE; + } + ret=IOGetVirtMem(&buff); +- if(ret==0) //if(ret!=RETCODE_SUCCESS) ++ if(ret == -1) //if(ret==MAP_FAILED) + { + VPU_ENC_ERROR("%s: get virtual memory failure: size=%d, ret=%d \r\n",__FUNCTION__,buff.size,(UINT32)ret); + return VPU_ENC_RET_FAILURE; +-- +1.9.1 + -- 2.0.1