This patch makes the following improvements to the error handling
in the ceph_mdsmap_decode function:
- Add a NULL check for return value from kcalloc
- Make use of the variable err
Signed-off-by: Emil Goode <[email protected]>
---
fs/ceph/mdsmap.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/fs/ceph/mdsmap.c b/fs/ceph/mdsmap.c
index 9278dec..d4d3897 100644
--- a/fs/ceph/mdsmap.c
+++ b/fs/ceph/mdsmap.c
@@ -138,6 +138,8 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)
m->m_info[mds].export_targets =
kcalloc(num_export_targets, sizeof(u32),
GFP_NOFS);
+ if (m->m_info[mds].export_targets == NULL)
+ goto badmem;
for (j = 0; j < num_export_targets; j++)
m->m_info[mds].export_targets[j] =
ceph_decode_32(&pexport_targets);
@@ -170,7 +172,7 @@ bad:
DUMP_PREFIX_OFFSET, 16, 1,
start, end - start, true);
ceph_mdsmap_destroy(m);
- return ERR_PTR(-EINVAL);
+ return ERR_PTR(err);
}
void ceph_mdsmap_destroy(struct ceph_mdsmap *m)
--
1.7.10.4
Applied to ceph tree; thanks!
On Tue, 28 May 2013, Emil Goode wrote:
> This patch makes the following improvements to the error handling
> in the ceph_mdsmap_decode function:
>
> - Add a NULL check for return value from kcalloc
> - Make use of the variable err
>
> Signed-off-by: Emil Goode <[email protected]>
> ---
> fs/ceph/mdsmap.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/ceph/mdsmap.c b/fs/ceph/mdsmap.c
> index 9278dec..d4d3897 100644
> --- a/fs/ceph/mdsmap.c
> +++ b/fs/ceph/mdsmap.c
> @@ -138,6 +138,8 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)
> m->m_info[mds].export_targets =
> kcalloc(num_export_targets, sizeof(u32),
> GFP_NOFS);
> + if (m->m_info[mds].export_targets == NULL)
> + goto badmem;
> for (j = 0; j < num_export_targets; j++)
> m->m_info[mds].export_targets[j] =
> ceph_decode_32(&pexport_targets);
> @@ -170,7 +172,7 @@ bad:
> DUMP_PREFIX_OFFSET, 16, 1,
> start, end - start, true);
> ceph_mdsmap_destroy(m);
> - return ERR_PTR(-EINVAL);
> + return ERR_PTR(err);
> }
>
> void ceph_mdsmap_destroy(struct ceph_mdsmap *m)
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
I introduced a new temporary variable "info" instead of
"m->m_info[mds]". Also I reversed the if condition and pulled
everything in one indent level.
Signed-off-by: Dan Carpenter <[email protected]>
---
This goes on top of Emil Goode's patch.
diff --git a/fs/ceph/mdsmap.c b/fs/ceph/mdsmap.c
index d4d3897..132b64e 100644
--- a/fs/ceph/mdsmap.c
+++ b/fs/ceph/mdsmap.c
@@ -92,6 +92,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)
u32 num_export_targets;
void *pexport_targets = NULL;
struct ceph_timespec laggy_since;
+ struct ceph_mds_info *info;
ceph_decode_need(p, end, sizeof(u64)*2 + 1 + sizeof(u32), bad);
global_id = ceph_decode_64(p);
@@ -126,26 +127,27 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)
i+1, n, global_id, mds, inc,
ceph_pr_addr(&addr.in_addr),
ceph_mds_state_name(state));
- if (mds >= 0 && mds < m->m_max_mds && state > 0) {
- m->m_info[mds].global_id = global_id;
- m->m_info[mds].state = state;
- m->m_info[mds].addr = addr;
- m->m_info[mds].laggy =
- (laggy_since.tv_sec != 0 ||
- laggy_since.tv_nsec != 0);
- m->m_info[mds].num_export_targets = num_export_targets;
- if (num_export_targets) {
- m->m_info[mds].export_targets =
- kcalloc(num_export_targets, sizeof(u32),
- GFP_NOFS);
- if (m->m_info[mds].export_targets == NULL)
- goto badmem;
- for (j = 0; j < num_export_targets; j++)
- m->m_info[mds].export_targets[j] =
- ceph_decode_32(&pexport_targets);
- } else {
- m->m_info[mds].export_targets = NULL;
- }
+
+ if (mds < 0 || mds >= m->m_max_mds || state <= 0)
+ continue;
+
+ info = &m->m_info[mds];
+ info->global_id = global_id;
+ info->state = state;
+ info->addr = addr;
+ info->laggy = (laggy_since.tv_sec != 0 ||
+ laggy_since.tv_nsec != 0);
+ info->num_export_targets = num_export_targets;
+ if (num_export_targets) {
+ info->export_targets = kcalloc(num_export_targets,
+ sizeof(u32), GFP_NOFS);
+ if (info->export_targets == NULL)
+ goto badmem;
+ for (j = 0; j < num_export_targets; j++)
+ info->export_targets[j] =
+ ceph_decode_32(&pexport_targets);
+ } else {
+ info->export_targets = NULL;
}
}
Am 29.05.2013 08:22, schrieb Dan Carpenter:
> I introduced a new temporary variable "info" instead of
> "m->m_info[mds]". Also I reversed the if condition and pulled
> everything in one indent level.
>
> Signed-off-by: Dan Carpenter <[email protected]>
> ---
> This goes on top of Emil Goode's patch.
>
> diff --git a/fs/ceph/mdsmap.c b/fs/ceph/mdsmap.c
> index d4d3897..132b64e 100644
> --- a/fs/ceph/mdsmap.c
> +++ b/fs/ceph/mdsmap.c
> @@ -92,6 +92,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)
> u32 num_export_targets;
> void *pexport_targets = NULL;
> struct ceph_timespec laggy_since;
> + struct ceph_mds_info *info;
>
> ceph_decode_need(p, end, sizeof(u64)*2 + 1 + sizeof(u32), bad);
> global_id = ceph_decode_64(p);
> @@ -126,26 +127,27 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)
> i+1, n, global_id, mds, inc,
> ceph_pr_addr(&addr.in_addr),
> ceph_mds_state_name(state));
> - if (mds >= 0 && mds < m->m_max_mds && state > 0) {
> - m->m_info[mds].global_id = global_id;
> - m->m_info[mds].state = state;
> - m->m_info[mds].addr = addr;
> - m->m_info[mds].laggy =
> - (laggy_since.tv_sec != 0 ||
> - laggy_since.tv_nsec != 0);
> - m->m_info[mds].num_export_targets = num_export_targets;
> - if (num_export_targets) {
> - m->m_info[mds].export_targets =
> - kcalloc(num_export_targets, sizeof(u32),
> - GFP_NOFS);
> - if (m->m_info[mds].export_targets == NULL)
> - goto badmem;
> - for (j = 0; j < num_export_targets; j++)
> - m->m_info[mds].export_targets[j] =
> - ceph_decode_32(&pexport_targets);
> - } else {
> - m->m_info[mds].export_targets = NULL;
> - }
> +
> + if (mds < 0 || mds >= m->m_max_mds || state <= 0)
> + continue;
> +
> + info = &m->m_info[mds];
> + info->global_id = global_id;
> + info->state = state;
> + info->addr = addr;
> + info->laggy = (laggy_since.tv_sec != 0 ||
> + laggy_since.tv_nsec != 0);
> + info->num_export_targets = num_export_targets;
personally i would go for:
info->export_targets = NULL;
and remove the else below.
hope that helps,
re,
wh
> + if (num_export_targets) {
> + info->export_targets = kcalloc(num_export_targets,
> + sizeof(u32), GFP_NOFS);
> + if (info->export_targets == NULL)
> + goto badmem;
> + for (j = 0; j < num_export_targets; j++)
> + info->export_targets[j] =
> + ceph_decode_32(&pexport_targets);
> + } else {
> + info->export_targets = NULL;
> }
> }
>
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
On Wed, May 29, 2013 at 09:17:21AM +0200, walter harms wrote:
> personally i would go for:
> info->export_targets = NULL;
> and remove the else below.
>
I don't have strong feelings one way or the other, but honestly, I
think the way I sent it is more clear.
regards,
dan carpenter
On 05/29/2013 01:22 AM, Dan Carpenter wrote:
> I introduced a new temporary variable "info" instead of
> "m->m_info[mds]". Also I reversed the if condition and pulled
> everything in one indent level.
Looks good. I will apply this for you.
Reviewed-by: Alex Elder <[email protected]>
>
> Signed-off-by: Dan Carpenter <[email protected]>
> ---
> This goes on top of Emil Goode's patch.
>
> diff --git a/fs/ceph/mdsmap.c b/fs/ceph/mdsmap.c
> index d4d3897..132b64e 100644
> --- a/fs/ceph/mdsmap.c
> +++ b/fs/ceph/mdsmap.c
> @@ -92,6 +92,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end)
> u32 num_export_targets;
> void *pexport_targets = NULL;
> struct ceph_timespec laggy_since;
> + struct ceph_mds_info *info;
>
> ceph_decode_need(p, end, sizeof(u64)*2 + 1 + sizeof(u32), bad);
> global_id = ceph_decode_64(p);
. . .