From 5a4455125be7c458df78343e9dc8146219e947d9 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Thu, 10 Feb 2011 11:57:16 +0000
Subject: [PATCH] --- yaml --- r: 233421 b: refs/heads/master c:
 d3337de52af7fb0ebe605b02b740be4ee7dee9eb h: refs/heads/master i:   233419:
 015080dc6a660fc83670fdf9a4d6fccbbfc3ec3b v: v3

---
 [refs]                | 2 +-
 trunk/net/dcb/dcbnl.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 403b74c7029e..bb83ebcae8fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ec79270d7de0c8ca602c47cb25a9652ec28f37f
+refs/heads/master: d3337de52af7fb0ebe605b02b740be4ee7dee9eb
diff --git a/trunk/net/dcb/dcbnl.c b/trunk/net/dcb/dcbnl.c
index 712ca026040a..d5074a567289 100644
--- a/trunk/net/dcb/dcbnl.c
+++ b/trunk/net/dcb/dcbnl.c
@@ -626,6 +626,9 @@ static int dcbnl_getapp(struct net_device *netdev, struct nlattr **tb,
 	dcb->cmd = DCB_CMD_GAPP;
 
 	app_nest = nla_nest_start(dcbnl_skb, DCB_ATTR_APP);
+	if (!app_nest)
+		goto out_cancel;
+
 	ret = nla_put_u8(dcbnl_skb, DCB_APP_ATTR_IDTYPE, idtype);
 	if (ret)
 		goto out_cancel;