History

xfrm Fix potential error pointer dereference in xfrm_bundle_create.

We may derference an invalid pointer in the error path of xfrm_bundle_create(). Fix this by returning this error pointer directly instead of assigning it to xdst0.

Steffen Klassert committed 8 years ago

Commit 38369f51 parent d9f92771 file · +2 −3Browse files

Unified · Split

net/xfrm/xfrm_policy.c+2−3
@@ -1658,7 +1658,6 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy, · 1657 unmodified lines
1658 trailer_len -= xdst_prev->u.dst.xfrm->props.trailer_len;1658 trailer_len -= xdst_prev->u.dst.xfrm->props.trailer_len;
1659 }1659 }
1660 1660
1661out:
1662 return &xdst0->u.dst;1661 return &xdst0->u.dst;
1663 1662
1664put_states:1663put_states:
@@ -1667,8 +1666,8 @@ put_states: · 2 unmodified lines
1667free_dst:1666free_dst:
1668 if (xdst0)1667 if (xdst0)
1669 dst_release_immediate(&xdst0->u.dst);1668 dst_release_immediate(&xdst0->u.dst);
1670 xdst0 = ERR_PTR(err);1669
1671 goto out;1670 return ERR_PTR(err);
1672}1671}
1673 1672
1674static int xfrm_expand_policies(const struct flowi *fl, u16 family,1673static int xfrm_expand_policies(const struct flowi *fl, u16 family,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t