Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1461176 > unrolled thread
| Started by | Vincent Stehlé <vincent.stehle@intel.com> |
|---|---|
| First post | 2016-08-12 15:30 +0200 |
| Last post | 2016-08-16 09:40 +0200 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] UBIFS: fix assertion in layout_in_gaps() Vincent Stehlé <vincent.stehle@intel.com> - 2016-08-12 15:30 +0200
Re: [PATCH] UBIFS: fix assertion in layout_in_gaps() Artem Bityutskiy <artem.bityutskiy@linux.intel.com> - 2016-08-12 17:50 +0200
Re: [PATCH] UBIFS: fix assertion in layout_in_gaps() Richard Weinberger <richard.weinberger@gmail.com> - 2016-08-14 11:10 +0200
Re: [PATCH] UBIFS: fix assertion in layout_in_gaps() Vincent Stehlé <vincent.stehle@intel.com> - 2016-08-16 09:40 +0200
| From | Vincent Stehlé <vincent.stehle@intel.com> |
|---|---|
| Date | 2016-08-12 15:30 +0200 |
| Subject | [PATCH] UBIFS: fix assertion in layout_in_gaps() |
| Message-ID | <s5kH7-2ca-5@gated-at.bofh.it> |
An assertion in layout_in_gaps() verifies that the gap_lebs pointer is
below the maximum bound. When computing this maximum bound the idx_lebs
count is multiplied by sizeof(int), while C pointers arithmetic does take
into account the size of the pointed elements implicitly already. Remove
the multiplication to fix the assertion.
Fixes: 1e51764a3c2ac05a ("UBIFS: add new flash file system")
Signed-off-by: Vincent Stehlé <vincent.stehle@intel.com>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
---
fs/ubifs/tnc_commit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ubifs/tnc_commit.c b/fs/ubifs/tnc_commit.c
index b45345d..51157da 100644
--- a/fs/ubifs/tnc_commit.c
+++ b/fs/ubifs/tnc_commit.c
@@ -370,7 +370,7 @@ static int layout_in_gaps(struct ubifs_info *c, int cnt)
p = c->gap_lebs;
do {
- ubifs_assert(p < c->gap_lebs + sizeof(int) * c->lst.idx_lebs);
+ ubifs_assert(p < c->gap_lebs + c->lst.idx_lebs);
written = layout_leb_in_gaps(c, p);
if (written < 0) {
err = written;
--
2.8.1
[toc] | [next] | [standalone]
| From | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> |
|---|---|
| Date | 2016-08-12 17:50 +0200 |
| Message-ID | <s5mSC-3vM-5@gated-at.bofh.it> |
| In reply to | #1461176 |
On Fri, 2016-08-12 at 15:26 +0200, Vincent Stehlé wrote:
> An assertion in layout_in_gaps() verifies that the gap_lebs pointer
> is
> below the maximum bound. When computing this maximum bound the
> idx_lebs
> count is multiplied by sizeof(int), while C pointers arithmetic does
> take
> into account the size of the pointed elements implicitly already.
> Remove
> the multiplication to fix the assertion.
>
> Fixes: 1e51764a3c2ac05a ("UBIFS: add new flash file system")
> Signed-off-by: Vincent Stehlé <vincent.stehle@intel.com>
> Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Thanks!
--
Best Regards,
Artem Bityutskiy
[toc] | [prev] | [next] | [standalone]
| From | Richard Weinberger <richard.weinberger@gmail.com> |
|---|---|
| Date | 2016-08-14 11:10 +0200 |
| Message-ID | <s5ZAC-5TR-9@gated-at.bofh.it> |
| In reply to | #1461176 |
Vincent,
On Fri, Aug 12, 2016 at 3:26 PM, Vincent Stehlé
<vincent.stehle@intel.com> wrote:
> An assertion in layout_in_gaps() verifies that the gap_lebs pointer is
> below the maximum bound. When computing this maximum bound the idx_lebs
> count is multiplied by sizeof(int), while C pointers arithmetic does take
> into account the size of the pointed elements implicitly already. Remove
> the multiplication to fix the assertion.
>
> Fixes: 1e51764a3c2ac05a ("UBIFS: add new flash file system")
> Signed-off-by: Vincent Stehlé <vincent.stehle@intel.com>
> Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
> ---
> fs/ubifs/tnc_commit.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/ubifs/tnc_commit.c b/fs/ubifs/tnc_commit.c
> index b45345d..51157da 100644
> --- a/fs/ubifs/tnc_commit.c
> +++ b/fs/ubifs/tnc_commit.c
> @@ -370,7 +370,7 @@ static int layout_in_gaps(struct ubifs_info *c, int cnt)
>
> p = c->gap_lebs;
> do {
> - ubifs_assert(p < c->gap_lebs + sizeof(int) * c->lst.idx_lebs);
> + ubifs_assert(p < c->gap_lebs + c->lst.idx_lebs);
Good catch! Did you hit this assertion or was it found by review?
I bet the latter since it is here since ever and given the wrongness
it is unlikely to trigger.
--
Thanks,
//richard
[toc] | [prev] | [next] | [standalone]
| From | Vincent Stehlé <vincent.stehle@intel.com> |
|---|---|
| Date | 2016-08-16 09:40 +0200 |
| Message-ID | <s6H8C-7r-27@gated-at.bofh.it> |
| In reply to | #1461734 |
On Sun, Aug 14, 2016 at 11:00:33AM +0200, Richard Weinberger wrote: .. > Good catch! Did you hit this assertion or was it found by review? > I bet the latter since it is here since ever and given the wrongness > it is unlikely to trigger. Dear Richard, It was found with a static checker and later review to confirm. Best regards, Vincent.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web