* [PATCH] exofs： don't increase urilen if krealloc() fails
@ 2013-04-28 11:46 Zhao Hongjiang
2013-04-29 16:40 ` Boaz Harrosh
0 siblings, 1 reply; 2+ messages in thread
From: Zhao Hongjiang @ 2013-04-28 11:46 UTC (permalink / raw)
To: bharrosh, bhalevy; +Cc: Andrew Morton, osd-dev, linux-kernel
Without the patch, edp->urilen is increased before krealloc(). If krealloc() fails,
edp->urilen is too high. Fix that by only updating edp->urilen if krealloc() is successful.
Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com>
---
fs/exofs/sys.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/exofs/sys.c b/fs/exofs/sys.c
index 1b4f2f9..79b0a85 100644
--- a/fs/exofs/sys.c
+++ b/fs/exofs/sys.c
@@ -82,11 +82,11 @@ static ssize_t uri_store(struct exofs_dev *edp, const char *buf, size_t len)
{
uint8_t *new_uri;
- edp->urilen = strlen(buf) + 1;
- new_uri = krealloc(edp->uri, edp->urilen, GFP_KERNEL);
+ new_uri = krealloc(edp->uri, strlen(buf) + 1, GFP_KERNEL);
if (new_uri == NULL)
return -ENOMEM;
edp->uri = new_uri;
+ edp->urilen = strlen(buf) + 1;
strncpy(edp->uri, buf, edp->urilen);
return edp->urilen;
}
-- 1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] exofs： don't increase urilen if krealloc() fails
2013-04-28 11:46 [PATCH] exofs： don't increase urilen if krealloc() fails Zhao Hongjiang
@ 2013-04-29 16:40 ` Boaz Harrosh
0 siblings, 0 replies; 2+ messages in thread
From: Boaz Harrosh @ 2013-04-29 16:40 UTC (permalink / raw)
To: Zhao Hongjiang; +Cc: bhalevy, Andrew Morton, osd-dev, linux-kernel
On 04/28/2013 04:46 AM, Zhao Hongjiang wrote:
> Without the patch, edp->urilen is increased before krealloc(). If krealloc() fails,
> edp->urilen is too high. Fix that by only updating edp->urilen if krealloc() is successful.
>
> Signed-off-by: Zhao Hongjiang <zhaohongjiang@huawei.com>
> ---
> fs/exofs/sys.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/exofs/sys.c b/fs/exofs/sys.c
> index 1b4f2f9..79b0a85 100644
> --- a/fs/exofs/sys.c
> +++ b/fs/exofs/sys.c
> @@ -82,11 +82,11 @@ static ssize_t uri_store(struct exofs_dev *edp, const char *buf, size_t len)
> {
> uint8_t *new_uri;
>
> - edp->urilen = strlen(buf) + 1;
> - new_uri = krealloc(edp->uri, edp->urilen, GFP_KERNEL);
> + new_uri = krealloc(edp->uri, strlen(buf) + 1, GFP_KERNEL);
> if (new_uri == NULL)
> return -ENOMEM;
> edp->uri = new_uri;
> + edp->urilen = strlen(buf) + 1;
> strncpy(edp->uri, buf, edp->urilen);
> return edp->urilen;
> }
> -- 1.7.1
>
Thank you, will apply
Boaz
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-29 16:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-28 11:46 [PATCH] exofs： don't increase urilen if krealloc() fails Zhao Hongjiang
2013-04-29 16:40 ` Boaz Harrosh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox