mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] ceph: fix possible NULL pointer dereference
@ 2011-03-26 18:29 Mariusz Kozlowski
  2011-03-26 20:48 ` Sage Weil
  0 siblings, 1 reply; 2+ messages in thread
From: Mariusz Kozlowski @ 2011-03-26 18:29 UTC (permalink / raw)
  To: Sage Weil
  Cc: David S. Miller, ceph-devel, netdev, linux-kernel, Mariusz Kozlowski

This patch fixes 'event_work' dereference before it is checked for NULL.

Signed-off-by: Mariusz Kozlowski <mk@lab.zgora.pl>
---
 net/ceph/osd_client.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 02212ed..b6776cb 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -1602,11 +1602,11 @@ void handle_watch_notify(struct ceph_osd_client *osdc, struct ceph_msg *msg)
 	     cookie, ver, event);
 	if (event) {
 		event_work = kmalloc(sizeof(*event_work), GFP_NOIO);
-		INIT_WORK(&event_work->work, do_event_work);
 		if (!event_work) {
 			dout("ERROR: could not allocate event_work\n");
 			goto done_err;
 		}
+		INIT_WORK(&event_work->work, do_event_work);
 		event_work->event = event;
 		event_work->ver = ver;
 		event_work->notify_id = notify_id;
-- 
1.7.0.4


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] ceph: fix possible NULL pointer dereference
  2011-03-26 18:29 [PATCH] ceph: fix possible NULL pointer dereference Mariusz Kozlowski
@ 2011-03-26 20:48 ` Sage Weil
  0 siblings, 0 replies; 2+ messages in thread
From: Sage Weil @ 2011-03-26 20:48 UTC (permalink / raw)
  To: Mariusz Kozlowski; +Cc: David S. Miller, ceph-devel, netdev, linux-kernel

Applied, thanks!

sage


On Sat, 26 Mar 2011, Mariusz Kozlowski wrote:

> This patch fixes 'event_work' dereference before it is checked for NULL.
> 
> Signed-off-by: Mariusz Kozlowski <mk@lab.zgora.pl>
> ---
>  net/ceph/osd_client.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
> index 02212ed..b6776cb 100644
> --- a/net/ceph/osd_client.c
> +++ b/net/ceph/osd_client.c
> @@ -1602,11 +1602,11 @@ void handle_watch_notify(struct ceph_osd_client *osdc, struct ceph_msg *msg)
>  	     cookie, ver, event);
>  	if (event) {
>  		event_work = kmalloc(sizeof(*event_work), GFP_NOIO);
> -		INIT_WORK(&event_work->work, do_event_work);
>  		if (!event_work) {
>  			dout("ERROR: could not allocate event_work\n");
>  			goto done_err;
>  		}
> +		INIT_WORK(&event_work->work, do_event_work);
>  		event_work->event = event;
>  		event_work->ver = ver;
>  		event_work->notify_id = notify_id;
> -- 
> 1.7.0.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-03-26 20:45 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-26 18:29 [PATCH] ceph: fix possible NULL pointer dereference Mariusz Kozlowski
2011-03-26 20:48 ` Sage Weil

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®