From 484c4ef5bb091d31e213798aed73055c71559c1b Mon Sep 17 00:00:00 2001 From: Jing Wang Date: Thu, 25 Oct 2012 15:00:56 +0800 Subject: [PATCH] --- yaml --- r: 346276 b: refs/heads/master c: 063eacf88cc1394ece125d106c05cba1ca03aa3d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 195389c52661..c9c38ca2e155 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 986836503e49ccf7e84b813715d344964ec93566 +refs/heads/master: 063eacf88cc1394ece125d106c05cba1ca03aa3d diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index 0331ad0b61e1..9a9d4fd264a9 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/drivers/block/drbd/drbd_receiver.c @@ -3663,6 +3663,10 @@ static int receive_uuids(struct drbd_tconn *tconn, struct packet_info *pi) return config_unknown_volume(tconn, pi); p_uuid = kmalloc(sizeof(u64)*UI_EXTENDED_SIZE, GFP_NOIO); + if (!p_uuid) { + dev_err(DEV, "kmalloc of p_uuid failed\n"); + return false; + } for (i = UI_CURRENT; i < UI_EXTENDED_SIZE; i++) p_uuid[i] = be64_to_cpu(p->uuid[i]);