From f4e2fe1d4b9135a379be8c74eca8870ca4d3cb69 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 29 Mar 2012 23:15:10 -0400 Subject: [PATCH] --- yaml --- r: 300379 b: refs/heads/master c: 7f116b5b6c2418e9d9ba2c2ba82cbbad45e36fc5 h: refs/heads/master i: 300377: e52264eb28ba81f3f1d72e2fdecb34a34fbaf266 300375: c54c3b79ba33d42bbfabbe860366206ba397073a v: v3 --- [refs] | 2 +- trunk/net/phonet/pn_netlink.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f5c4fb580b34..ebbbc99456da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b34ec43c9b3de44a5420841ab293d1b2035a94c +refs/heads/master: 7f116b5b6c2418e9d9ba2c2ba82cbbad45e36fc5 diff --git a/trunk/net/phonet/pn_netlink.c b/trunk/net/phonet/pn_netlink.c index d61f6761777d..cfdf135fcd69 100644 --- a/trunk/net/phonet/pn_netlink.c +++ b/trunk/net/phonet/pn_netlink.c @@ -116,7 +116,8 @@ static int fill_addr(struct sk_buff *skb, struct net_device *dev, u8 addr, ifm->ifa_flags = IFA_F_PERMANENT; ifm->ifa_scope = RT_SCOPE_LINK; ifm->ifa_index = dev->ifindex; - NLA_PUT_U8(skb, IFA_LOCAL, addr); + if (nla_put_u8(skb, IFA_LOCAL, addr)) + goto nla_put_failure; return nlmsg_end(skb, nlh); nla_put_failure: @@ -183,8 +184,9 @@ static int fill_route(struct sk_buff *skb, struct net_device *dev, u8 dst, rtm->rtm_scope = RT_SCOPE_UNIVERSE; rtm->rtm_type = RTN_UNICAST; rtm->rtm_flags = 0; - NLA_PUT_U8(skb, RTA_DST, dst); - NLA_PUT_U32(skb, RTA_OIF, dev->ifindex); + if (nla_put_u8(skb, RTA_DST, dst) || + nla_put_u32(skb, RTA_OIF, dev->ifindex)) + goto nla_put_failure; return nlmsg_end(skb, nlh); nla_put_failure: