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


Groups > linux.kernel > #1467813 > unrolled thread

[PATCH] staging: lustre: mdc: fix NULL pointer dereference in mdc_adjust_dirpages

Started byJames Simmons <jsimmons@infradead.org>
First post2016-08-22 19:00 +0200
Last post2016-08-22 19:10 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] staging: lustre: mdc: fix NULL pointer dereference in mdc_adjust_dirpages James Simmons <jsimmons@infradead.org> - 2016-08-22 19:00 +0200
    Re: [lustre-devel] [PATCH] staging: lustre: mdc: fix NULL pointer         dereference in mdc_adjust_dirpages "Dilger, Andreas" <andreas.dilger@intel.com> - 2016-08-22 19:10 +0200

#1467813 — [PATCH] staging: lustre: mdc: fix NULL pointer dereference in mdc_adjust_dirpages

FromJames Simmons <jsimmons@infradead.org>
Date2016-08-22 19:00 +0200
Subject[PATCH] staging: lustre: mdc: fix NULL pointer dereference in mdc_adjust_dirpages
Message-ID<s90JP-my-11@gated-at.bofh.it>
The function mdc_adjust_dirpages is only called on platforms which
don't have pages 4K in size which is why kbuild only reported this
for platforms like the Alpha. The problem was a typo in ordering of
variables in the beginning of a while loop. We were accessing the
dp pointer before it was kmapped.

Signed-off-by: James Simmons <jsimmons@infradead.org>
---
 drivers/staging/lustre/lustre/mdc/mdc_request.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
index 88848d8..7a182be 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_request.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c
@@ -1133,9 +1133,9 @@ static void mdc_adjust_dirpages(struct page **pages, int cfs_pgs, int lu_pgs)
 	int i;
 
 	for (i = 0; i < cfs_pgs; i++) {
+		struct lu_dirpage *dp = kmap(pages[i]);
 		__u64 hash_end = le64_to_cpu(dp->ldp_hash_end);
 		__u32 flags = le32_to_cpu(dp->ldp_flags);
-		struct lu_dirpage *dp = kmap(pages[i]);
 		struct lu_dirpage *first = dp;
 		struct lu_dirent *end_dirent = NULL;
 		struct lu_dirent *ent;
-- 
1.7.1

[toc] | [next] | [standalone]


#1467827 — Re: [lustre-devel] [PATCH] staging: lustre: mdc: fix NULL pointer dereference in mdc_adjust_dirpages

From"Dilger, Andreas" <andreas.dilger@intel.com>
Date2016-08-22 19:10 +0200
SubjectRe: [lustre-devel] [PATCH] staging: lustre: mdc: fix NULL pointer dereference in mdc_adjust_dirpages
Message-ID<s90Tv-F4-3@gated-at.bofh.it>
In reply to#1467813
On Aug 22, 2016, at 10:57, James Simmons <jsimmons@infradead.org> wrote:
> 
> The function mdc_adjust_dirpages is only called on platforms which
> don't have pages 4K in size which is why kbuild only reported this
> for platforms like the Alpha. The problem was a typo in ordering of
> variables in the beginning of a while loop. We were accessing the
> dp pointer before it was kmapped.
> 
> Signed-off-by: James Simmons <jsimmons@infradead.org>

Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>

> ---
> drivers/staging/lustre/lustre/mdc/mdc_request.c |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
> index 88848d8..7a182be 100644
> --- a/drivers/staging/lustre/lustre/mdc/mdc_request.c
> +++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c
> @@ -1133,9 +1133,9 @@ static void mdc_adjust_dirpages(struct page **pages, int cfs_pgs, int lu_pgs)
> 	int i;
> 
> 	for (i = 0; i < cfs_pgs; i++) {
> +		struct lu_dirpage *dp = kmap(pages[i]);
> 		__u64 hash_end = le64_to_cpu(dp->ldp_hash_end);
> 		__u32 flags = le32_to_cpu(dp->ldp_flags);
> -		struct lu_dirpage *dp = kmap(pages[i]);
> 		struct lu_dirpage *first = dp;
> 		struct lu_dirent *end_dirent = NULL;
> 		struct lu_dirent *ent;
> -- 
> 1.7.1
> 
> _______________________________________________
> lustre-devel mailing list
> lustre-devel@lists.lustre.org
> http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web