* [PATCH stable] ipv4: avoid passing NULL to inet_putpeer() in icmpv4_xrlim_allow() [not found] <1411074275.5265862.1354894974886.JavaMail.root@redhat.com> @ 2012-12-07 15:46 ` CAI Qian 2012-12-07 17:14 ` David Miller 0 siblings, 1 reply; 2+ messages in thread From: CAI Qian @ 2012-12-07 15:46 UTC (permalink / raw) To: netdev; +Cc: Neal Cardwell, David S. Miller David, this patch looks applicable for the stable releases. >From Neal Cardwell <ncardwell@google.com> inet_getpeer_v4() can return NULL under OOM conditions, and while inet_peer_xrlim_allow() is OK with a NULL peer, inet_putpeer() will crash. This code path now uses the same idiom as the others from: 1d861aa4b3fb08822055345f480850205ffe6170 ("inet: Minimize use of cached route inetpeer."). Signed-off-by: Neal Cardwell <ncardwell@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Upstream-ID: e1a676424c290b1c8d757e3860170ac7ecd89af4 Stable-trees: 3.6.x Signed-off-by: CAI Qian <caiqian@redhat.com> diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index f2eccd5..17ff9fd 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -257,7 +257,8 @@ static inline bool icmpv4_xrlim_allow(struct net *net, struct rtable *rt, struct inet_peer *peer = inet_getpeer_v4(net->ipv4.peers, fl4->daddr, 1); rc = inet_peer_xrlim_allow(peer, net->ipv4.sysctl_icmp_ratelimit); - inet_putpeer(peer); + if (peer) + inet_putpeer(peer); } out: return rc; ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH stable] ipv4: avoid passing NULL to inet_putpeer() in icmpv4_xrlim_allow() 2012-12-07 15:46 ` [PATCH stable] ipv4: avoid passing NULL to inet_putpeer() in icmpv4_xrlim_allow() CAI Qian @ 2012-12-07 17:14 ` David Miller 0 siblings, 0 replies; 2+ messages in thread From: David Miller @ 2012-12-07 17:14 UTC (permalink / raw) To: caiqian; +Cc: netdev, ncardwell From: CAI Qian <caiqian@redhat.com> Date: Fri, 7 Dec 2012 10:46:40 -0500 (EST) > David, this patch looks applicable for the stable releases. > > From Neal Cardwell <ncardwell@google.com> > > inet_getpeer_v4() can return NULL under OOM conditions, and while > inet_peer_xrlim_allow() is OK with a NULL peer, inet_putpeer() will > crash. > > This code path now uses the same idiom as the others from: > 1d861aa4b3fb08822055345f480850205ffe6170 ("inet: Minimize use of > cached route inetpeer."). > > Signed-off-by: Neal Cardwell <ncardwell@google.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > > Upstream-ID: e1a676424c290b1c8d757e3860170ac7ecd89af4 > Stable-trees: 3.6.x > Signed-off-by: CAI Qian <caiqian@redhat.com> Please stop submitting networking -stable changes. ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-12-07 17:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1411074275.5265862.1354894974886.JavaMail.root@redhat.com>
2012-12-07 15:46 ` [PATCH stable] ipv4: avoid passing NULL to inet_putpeer() in icmpv4_xrlim_allow() CAI Qian
2012-12-07 17:14 ` David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).