From 185954a75ce1b1f30b374cae77284f35247c39e1 Mon Sep 17 00:00:00 2001 From: Rajesh Borundia Date: Tue, 2 Apr 2013 05:34:40 +0000 Subject: [PATCH] --- yaml --- r: 368811 b: refs/heads/master c: d8fe3436df256ce48d953dc342ac114e6e368476 h: refs/heads/master i: 368809: b101893f6c8976ae03edb585a18aec0f56bc864d 368807: 58552da1fcb8ab25c1bc5058e3ebdc5cd5fc956f v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b9d08842e505..72424f2e7ffc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8466563e16d5198b6efeb3b51791b95b6aaacb6b +refs/heads/master: d8fe3436df256ce48d953dc342ac114e6e368476 diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c index ddc130b23378..253b3ac16046 100644 --- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c +++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c @@ -560,6 +560,8 @@ void qlcnic_set_multi(struct net_device *netdev) netdev_for_each_mc_addr(ha, netdev) { cur = kzalloc(sizeof(struct qlcnic_mac_list_s), GFP_ATOMIC); + if (cur == NULL) + break; memcpy(cur->mac_addr, ha->addr, ETH_ALEN); list_add_tail(&cur->list, &adapter->vf_mc_list);