History

xfrm: xfrm_policy: fix a possible double xfrm_pols_put() in xfrm_bundle_lookup()

xfrm_policy_lookup() will call xfrm_pol_hold_rcu() to get a refcount of pols[0]. This refcount can be dropped in xfrm_expand_policies() when xfrm_expand_policies() return error. pols[0]'s refcount is balanced in here. But xfrm_bundle_lookup() will also call xfrm_pols_put() with num_pols == 1 to drop this refcount when xfrm_expand_policies() return error. This patch also fix an illegal address access. pols[0] will save a error point when xfrm_policy_lookup fails. This lead to xfrm_pols_put to resolve an illegal address in xfrm_bundle_lookup's error path. Fix these by setting num_pols = 0 in xfrm_expand_policies()'s error path.

Hangyu Hua committed 4 years ago

Commit f85daf01 parent 9f4fc181 file · +4 −1Browse files

Unified · Split

net/xfrm/xfrm_policy.c+4−1
@@ -2678,8 +2678,10 @@ static int xfrm_expand_policies(const struct flowi *fl, u16 family, · 2677 unmodified lines
2678 *num_xfrms = 0;2678 *num_xfrms = 0;
2679 return 0;2679 return 0;
2680 }2680 }
2681 if (IS_ERR(pols[0]))2681 if (IS_ERR(pols[0])) {
2682 *num_pols = 0;
2682 return PTR_ERR(pols[0]);2683 return PTR_ERR(pols[0]);
2684 }
2683 2685
2684 *num_xfrms = pols[0]->xfrm_nr;2686 *num_xfrms = pols[0]->xfrm_nr;
2685 2687
@@ -2694,6 +2696,7 @@ static int xfrm_expand_policies(const struct flowi *fl, u16 family, · 8 unmodified lines
2694 if (pols[1]) {2696 if (pols[1]) {
2695 if (IS_ERR(pols[1])) {2697 if (IS_ERR(pols[1])) {
2696 xfrm_pols_put(pols, *num_pols);2698 xfrm_pols_put(pols, *num_pols);
2699 *num_pols = 0;
2697 return PTR_ERR(pols[1]);2700 return PTR_ERR(pols[1]);
2698 }2701 }
2699 (*num_pols)++;2702 (*num_pols)++;

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