* [PATCH] iommu/msm: Fix error handling in msm_iommu_unmap()
@ 2012-01-26 17:29 ` Joerg Roedel
0 siblings, 0 replies; 6+ messages in thread
From: Joerg Roedel @ 2012-01-26 17:29 UTC (permalink / raw)
To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA
Cc: David Brown, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
Stepan Moskovchenko
Error handling in msm_iommu_unmap() is broken. On some error
conditions retval is set to a non-zero value which causes
the function to return 'len' at the end. This hides the
error from the user. Zero should be returned in those error
cases.
Cc: David Brown <davidb-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Cc: Stepan Moskovchenko <stepanm-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Signed-off-by: Joerg Roedel <joerg.roedel-5C7GfCeVMHo@public.gmane.org>
---
drivers/iommu/msm_iommu.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 08a90b8..cee307e 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -482,23 +482,19 @@ static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
priv = domain->priv;
- if (!priv) {
- ret = -ENODEV;
+ if (!priv)
goto fail;
- }
fl_table = priv->pgtable;
if (len != SZ_16M && len != SZ_1M &&
len != SZ_64K && len != SZ_4K) {
pr_debug("Bad length: %d\n", len);
- ret = -EINVAL;
goto fail;
}
if (!fl_table) {
pr_debug("Null page table\n");
- ret = -EINVAL;
goto fail;
}
@@ -507,7 +503,6 @@ static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
if (*fl_pte == 0) {
pr_debug("First level PTE is 0\n");
- ret = -ENODEV;
goto fail;
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] iommu/msm: Fix error handling in msm_iommu_unmap()
@ 2012-01-26 17:29 ` Joerg Roedel
0 siblings, 0 replies; 6+ messages in thread
From: Joerg Roedel @ 2012-01-26 17:29 UTC (permalink / raw)
To: iommu; +Cc: linux-kernel, Joerg Roedel, David Brown, Stepan Moskovchenko
Error handling in msm_iommu_unmap() is broken. On some error
conditions retval is set to a non-zero value which causes
the function to return 'len' at the end. This hides the
error from the user. Zero should be returned in those error
cases.
Cc: David Brown <davidb@codeaurora.org>
Cc: Stepan Moskovchenko <stepanm@codeaurora.org>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
drivers/iommu/msm_iommu.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/drivers/iommu/msm_iommu.c b/drivers/iommu/msm_iommu.c
index 08a90b8..cee307e 100644
--- a/drivers/iommu/msm_iommu.c
+++ b/drivers/iommu/msm_iommu.c
@@ -482,23 +482,19 @@ static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
priv = domain->priv;
- if (!priv) {
- ret = -ENODEV;
+ if (!priv)
goto fail;
- }
fl_table = priv->pgtable;
if (len != SZ_16M && len != SZ_1M &&
len != SZ_64K && len != SZ_4K) {
pr_debug("Bad length: %d\n", len);
- ret = -EINVAL;
goto fail;
}
if (!fl_table) {
pr_debug("Null page table\n");
- ret = -EINVAL;
goto fail;
}
@@ -507,7 +503,6 @@ static size_t msm_iommu_unmap(struct iommu_domain *domain, unsigned long va,
if (*fl_pte == 0) {
pr_debug("First level PTE is 0\n");
- ret = -ENODEV;
goto fail;
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread[parent not found: <1327598984-20662-1-git-send-email-joerg.roedel-5C7GfCeVMHo@public.gmane.org>]
* Re: [PATCH] iommu/msm: Fix error handling in msm_iommu_unmap()
2012-01-26 17:29 ` Joerg Roedel
@ 2012-01-27 0:06 ` David Brown
-1 siblings, 0 replies; 6+ messages in thread
From: David Brown @ 2012-01-27 0:06 UTC (permalink / raw)
To: Joerg Roedel
Cc: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Stepan Moskovchenko
On Thu, Jan 26, 2012 at 06:29:44PM +0100, Joerg Roedel wrote:
> Error handling in msm_iommu_unmap() is broken. On some error
> conditions retval is set to a non-zero value which causes
> the function to return 'len' at the end. This hides the
> error from the user. Zero should be returned in those error
> cases.
>
> Cc: David Brown <davidb-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
> Cc: Stepan Moskovchenko <stepanm-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
> Signed-off-by: Joerg Roedel <joerg.roedel-5C7GfCeVMHo@public.gmane.org>
> ---
> drivers/iommu/msm_iommu.c | 7 +------
> 1 files changed, 1 insertions(+), 6 deletions(-)
Acked-by: David Brown <davidb-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] iommu/msm: Fix error handling in msm_iommu_unmap()
@ 2012-01-27 0:06 ` David Brown
0 siblings, 0 replies; 6+ messages in thread
From: David Brown @ 2012-01-27 0:06 UTC (permalink / raw)
To: Joerg Roedel; +Cc: iommu, linux-kernel, Stepan Moskovchenko
On Thu, Jan 26, 2012 at 06:29:44PM +0100, Joerg Roedel wrote:
> Error handling in msm_iommu_unmap() is broken. On some error
> conditions retval is set to a non-zero value which causes
> the function to return 'len' at the end. This hides the
> error from the user. Zero should be returned in those error
> cases.
>
> Cc: David Brown <davidb@codeaurora.org>
> Cc: Stepan Moskovchenko <stepanm@codeaurora.org>
> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
> ---
> drivers/iommu/msm_iommu.c | 7 +------
> 1 files changed, 1 insertions(+), 6 deletions(-)
Acked-by: David Brown <davidb@codeaurora.org>
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20120127000630.GB16263-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>]
* Re: [PATCH] iommu/msm: Fix error handling in msm_iommu_unmap()
2012-01-27 0:06 ` David Brown
@ 2012-01-27 16:40 ` Joerg Roedel
-1 siblings, 0 replies; 6+ messages in thread
From: Joerg Roedel @ 2012-01-27 16:40 UTC (permalink / raw)
To: David Brown
Cc: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Stepan Moskovchenko
On Thu, Jan 26, 2012 at 04:06:30PM -0800, David Brown wrote:
> On Thu, Jan 26, 2012 at 06:29:44PM +0100, Joerg Roedel wrote:
> > Error handling in msm_iommu_unmap() is broken. On some error
> > conditions retval is set to a non-zero value which causes
> > the function to return 'len' at the end. This hides the
> > error from the user. Zero should be returned in those error
> > cases.
> >
> > Cc: David Brown <davidb-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
> > Cc: Stepan Moskovchenko <stepanm-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
> > Signed-off-by: Joerg Roedel <joerg.roedel-5C7GfCeVMHo@public.gmane.org>
> > ---
> > drivers/iommu/msm_iommu.c | 7 +------
> > 1 files changed, 1 insertions(+), 6 deletions(-)
>
> Acked-by: David Brown <davidb-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
Thanks. I'll queue this up with iommu fixes for 3.3 and mark it for
stable as well.
Joerg
--
AMD Operating System Research Center
Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] iommu/msm: Fix error handling in msm_iommu_unmap()
@ 2012-01-27 16:40 ` Joerg Roedel
0 siblings, 0 replies; 6+ messages in thread
From: Joerg Roedel @ 2012-01-27 16:40 UTC (permalink / raw)
To: David Brown; +Cc: iommu, linux-kernel, Stepan Moskovchenko
On Thu, Jan 26, 2012 at 04:06:30PM -0800, David Brown wrote:
> On Thu, Jan 26, 2012 at 06:29:44PM +0100, Joerg Roedel wrote:
> > Error handling in msm_iommu_unmap() is broken. On some error
> > conditions retval is set to a non-zero value which causes
> > the function to return 'len' at the end. This hides the
> > error from the user. Zero should be returned in those error
> > cases.
> >
> > Cc: David Brown <davidb@codeaurora.org>
> > Cc: Stepan Moskovchenko <stepanm@codeaurora.org>
> > Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
> > ---
> > drivers/iommu/msm_iommu.c | 7 +------
> > 1 files changed, 1 insertions(+), 6 deletions(-)
>
> Acked-by: David Brown <davidb@codeaurora.org>
Thanks. I'll queue this up with iommu fixes for 3.3 and mark it for
stable as well.
Joerg
--
AMD Operating System Research Center
Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-01-27 16:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-26 17:29 [PATCH] iommu/msm: Fix error handling in msm_iommu_unmap() Joerg Roedel
2012-01-26 17:29 ` Joerg Roedel
[not found] ` <1327598984-20662-1-git-send-email-joerg.roedel-5C7GfCeVMHo@public.gmane.org>
2012-01-27 0:06 ` David Brown
2012-01-27 0:06 ` David Brown
[not found] ` <20120127000630.GB16263-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2012-01-27 16:40 ` Joerg Roedel
2012-01-27 16:40 ` Joerg Roedel
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.