Skip to content

Commit 8a92280

Browse files
Zhongjun Tanpcmoore
authored andcommitted
selinux: delete selinux_xfrm_policy_lookup() useless argument
seliunx_xfrm_policy_lookup() is hooks of security_xfrm_policy_lookup(). The dir argument is uselss in security_xfrm_policy_lookup(). So remove the dir argument from selinux_xfrm_policy_lookup() and security_xfrm_policy_lookup(). Signed-off-by: Zhongjun Tan <[email protected]> [PM: reformat the subject line] Signed-off-by: Paul Moore <[email protected]>
1 parent e1cce3a commit 8a92280

File tree

6 files changed

+9
-12
lines changed

6 files changed

+9
-12
lines changed

include/linux/lsm_hook_defs.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,7 @@ LSM_HOOK(int, 0, xfrm_state_alloc_acquire, struct xfrm_state *x,
358358
struct xfrm_sec_ctx *polsec, u32 secid)
359359
LSM_HOOK(void, LSM_RET_VOID, xfrm_state_free_security, struct xfrm_state *x)
360360
LSM_HOOK(int, 0, xfrm_state_delete_security, struct xfrm_state *x)
361-
LSM_HOOK(int, 0, xfrm_policy_lookup, struct xfrm_sec_ctx *ctx, u32 fl_secid,
362-
u8 dir)
361+
LSM_HOOK(int, 0, xfrm_policy_lookup, struct xfrm_sec_ctx *ctx, u32 fl_secid)
363362
LSM_HOOK(int, 1, xfrm_state_pol_flow_match, struct xfrm_state *x,
364363
struct xfrm_policy *xp, const struct flowi_common *flic)
365364
LSM_HOOK(int, 0, xfrm_decode_session, struct sk_buff *skb, u32 *secid,

include/linux/security.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1681,7 +1681,7 @@ int security_xfrm_state_alloc_acquire(struct xfrm_state *x,
16811681
struct xfrm_sec_ctx *polsec, u32 secid);
16821682
int security_xfrm_state_delete(struct xfrm_state *x);
16831683
void security_xfrm_state_free(struct xfrm_state *x);
1684-
int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir);
1684+
int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid);
16851685
int security_xfrm_state_pol_flow_match(struct xfrm_state *x,
16861686
struct xfrm_policy *xp,
16871687
const struct flowi_common *flic);
@@ -1732,7 +1732,7 @@ static inline int security_xfrm_state_delete(struct xfrm_state *x)
17321732
return 0;
17331733
}
17341734

1735-
static inline int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir)
1735+
static inline int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid)
17361736
{
17371737
return 0;
17381738
}

net/xfrm/xfrm_policy.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1902,8 +1902,7 @@ static int xfrm_policy_match(const struct xfrm_policy *pol,
19021902

19031903
match = xfrm_selector_match(sel, fl, family);
19041904
if (match)
1905-
ret = security_xfrm_policy_lookup(pol->security, fl->flowi_secid,
1906-
dir);
1905+
ret = security_xfrm_policy_lookup(pol->security, fl->flowi_secid);
19071906
return ret;
19081907
}
19091908

@@ -2181,8 +2180,7 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir,
21812180
goto out;
21822181
}
21832182
err = security_xfrm_policy_lookup(pol->security,
2184-
fl->flowi_secid,
2185-
dir);
2183+
fl->flowi_secid);
21862184
if (!err) {
21872185
if (!xfrm_pol_hold_rcu(pol))
21882186
goto again;

security/security.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2466,9 +2466,9 @@ void security_xfrm_state_free(struct xfrm_state *x)
24662466
call_void_hook(xfrm_state_free_security, x);
24672467
}
24682468

2469-
int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir)
2469+
int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid)
24702470
{
2471-
return call_int_hook(xfrm_policy_lookup, 0, ctx, fl_secid, dir);
2471+
return call_int_hook(xfrm_policy_lookup, 0, ctx, fl_secid);
24722472
}
24732473

24742474
int security_xfrm_state_pol_flow_match(struct xfrm_state *x,

security/selinux/include/xfrm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ int selinux_xfrm_state_alloc_acquire(struct xfrm_state *x,
2323
struct xfrm_sec_ctx *polsec, u32 secid);
2424
void selinux_xfrm_state_free(struct xfrm_state *x);
2525
int selinux_xfrm_state_delete(struct xfrm_state *x);
26-
int selinux_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir);
26+
int selinux_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid);
2727
int selinux_xfrm_state_pol_flow_match(struct xfrm_state *x,
2828
struct xfrm_policy *xp,
2929
const struct flowi_common *flic);

security/selinux/xfrm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ static int selinux_xfrm_delete(struct xfrm_sec_ctx *ctx)
150150
* LSM hook implementation that authorizes that a flow can use a xfrm policy
151151
* rule.
152152
*/
153-
int selinux_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir)
153+
int selinux_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid)
154154
{
155155
int rc;
156156

0 commit comments

Comments
 (0)