projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'media/v5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[linux-2.6-microblaze.git]
/
security
/
security.c
diff --git
a/security/security.c
b/security/security.c
index
fe33c0a
..
7b09cfb
100644
(file)
--- a/
security/security.c
+++ b/
security/security.c
@@
-2208,15
+2208,16
@@
void security_sk_clone(const struct sock *sk, struct sock *newsk)
}
EXPORT_SYMBOL(security_sk_clone);
}
EXPORT_SYMBOL(security_sk_clone);
-void security_sk_classify_flow(struct sock *sk, struct flowi
*fl
)
+void security_sk_classify_flow(struct sock *sk, struct flowi
_common *flic
)
{
{
- call_void_hook(sk_getsecid, sk, &fl
->flowi
_secid);
+ call_void_hook(sk_getsecid, sk, &fl
ic->flowic
_secid);
}
EXPORT_SYMBOL(security_sk_classify_flow);
}
EXPORT_SYMBOL(security_sk_classify_flow);
-void security_req_classify_flow(const struct request_sock *req, struct flowi *fl)
+void security_req_classify_flow(const struct request_sock *req,
+ struct flowi_common *flic)
{
{
- call_void_hook(req_classify_flow, req, fl);
+ call_void_hook(req_classify_flow, req, fl
ic
);
}
EXPORT_SYMBOL(security_req_classify_flow);
}
EXPORT_SYMBOL(security_req_classify_flow);
@@
-2408,7
+2409,7
@@
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,
int security_xfrm_state_pol_flow_match(struct xfrm_state *x,
struct xfrm_policy *xp,
- const struct flowi
*fl
)
+ const struct flowi
_common *flic
)
{
struct security_hook_list *hp;
int rc = LSM_RET_DEFAULT(xfrm_state_pol_flow_match);
{
struct security_hook_list *hp;
int rc = LSM_RET_DEFAULT(xfrm_state_pol_flow_match);
@@
-2424,7
+2425,7
@@
int security_xfrm_state_pol_flow_match(struct xfrm_state *x,
*/
hlist_for_each_entry(hp, &security_hook_heads.xfrm_state_pol_flow_match,
list) {
*/
hlist_for_each_entry(hp, &security_hook_heads.xfrm_state_pol_flow_match,
list) {
- rc = hp->hook.xfrm_state_pol_flow_match(x, xp, fl);
+ rc = hp->hook.xfrm_state_pol_flow_match(x, xp, fl
ic
);
break;
}
return rc;
break;
}
return rc;
@@
-2435,9
+2436,9
@@
int security_xfrm_decode_session(struct sk_buff *skb, u32 *secid)
return call_int_hook(xfrm_decode_session, 0, skb, secid, 1);
}
return call_int_hook(xfrm_decode_session, 0, skb, secid, 1);
}
-void security_skb_classify_flow(struct sk_buff *skb, struct flowi
*fl
)
+void security_skb_classify_flow(struct sk_buff *skb, struct flowi
_common *flic
)
{
{
- int rc = call_int_hook(xfrm_decode_session, 0, skb, &fl
->flowi
_secid,
+ int rc = call_int_hook(xfrm_decode_session, 0, skb, &fl
ic->flowic
_secid,
0);
BUG_ON(rc);
0);
BUG_ON(rc);