Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e33f7704 authored by David S. Miller's avatar David S. Miller
Browse files

xfrm: Mark flowi arg to security_xfrm_state_pol_flow_match() const. 



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e1ad2ab2

include/linux/security.h

+4 −3
Original line number Diff line number Diff line
@@ -1623,7 +1623,7 @@ struct security_operations { 
	int (*xfrm_policy_lookup) (struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir);

	int (*xfrm_state_pol_flow_match) (struct xfrm_state *x,

					  struct xfrm_policy *xp,

					  struct flowi *fl);

					  const struct flowi *fl);

	int (*xfrm_decode_session) (struct sk_buff *skb, u32 *secid, int ckall);

#endif	/* CONFIG_SECURITY_NETWORK_XFRM */
@@ -2761,7 +2761,8 @@ int security_xfrm_state_delete(struct xfrm_state *x); 
void security_xfrm_state_free(struct xfrm_state *x);

int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir);

int security_xfrm_state_pol_flow_match(struct xfrm_state *x,

				       struct xfrm_policy *xp, struct flowi *fl);

				       struct xfrm_policy *xp,

				       const struct flowi *fl);

int security_xfrm_decode_session(struct sk_buff *skb, u32 *secid);

void security_skb_classify_flow(struct sk_buff *skb, struct flowi *fl);
@@ -2813,7 +2814,7 @@ static inline int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_s 
}



static inline int security_xfrm_state_pol_flow_match(struct xfrm_state *x,

			struct xfrm_policy *xp, struct flowi *fl)

			struct xfrm_policy *xp, const struct flowi *fl)

{

	return 1;

}

security/capability.c

+1 −1
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ static int cap_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 sk_sid, u8 dir) 


static int cap_xfrm_state_pol_flow_match(struct xfrm_state *x,

					 struct xfrm_policy *xp,

					 struct flowi *fl)

					 const struct flowi *fl)

{

	return 1;

}

security/security.c

+2 −1
Original line number Diff line number Diff line
@@ -1233,7 +1233,8 @@ int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir) 
}



int security_xfrm_state_pol_flow_match(struct xfrm_state *x,

				       struct xfrm_policy *xp, struct flowi *fl)

				       struct xfrm_policy *xp,

				       const struct flowi *fl)

{

	return security_ops->xfrm_state_pol_flow_match(x, xp, fl);

}

security/selinux/include/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ void selinux_xfrm_state_free(struct xfrm_state *x); 
int selinux_xfrm_state_delete(struct xfrm_state *x);

int selinux_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir);

int selinux_xfrm_state_pol_flow_match(struct xfrm_state *x,

			struct xfrm_policy *xp, struct flowi *fl);

			struct xfrm_policy *xp, const struct flowi *fl);



/*

 * Extract the security blob from the sock (it's actually on the socket)

security/selinux/xfrm.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ int selinux_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir) 
 */



int selinux_xfrm_state_pol_flow_match(struct xfrm_state *x, struct xfrm_policy *xp,

			struct flowi *fl)

			const struct flowi *fl)

{

	u32 state_sid;

	int rc;