| Submitter | Neal Cardwell |
|---|---|
| Date | Nov. 25, 2012, 4:54 a.m. |
| Message ID | <1353819277-2350-1-git-send-email-ncardwell@google.com> |
| Download | mbox | patch |
| Permalink | /patch/201513/ |
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Comments
From: Neal Cardwell <ncardwell@google.com> Date: Sat, 24 Nov 2012 23:54:37 -0500 > 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> Applied, thanks a lot Neil. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Patch
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;
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> --- net/ipv4/icmp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)