Message ID | 20230706132337.15924-9-cgzones@googlemail.com (mailing list archive) |
---|---|
State | Accepted |
Delegated to: | Paul Moore |
Headers | show |
Series | [RFC,01/20] selinux: check for multiplication overflow in put_entry() | expand |
On Jul 6, 2023 =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com> wrote: > > Align the type with the one used in selinux_notify_policy_change() and > the sequence member of struct selinux_kernel_status. > > Signed-off-by: Christian Göttsche <cgzones@googlemail.com> > --- > security/selinux/include/security.h | 2 +- > security/selinux/status.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) I was going to suggest you also update avc_latest_notif_update(), but it looks like you tackle that later in the patchset. Merged into selinux/next, thanks. > diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h > index 0f93fd019bb4..a16c52d553e1 100644 > --- a/security/selinux/include/security.h > +++ b/security/selinux/include/security.h > @@ -376,7 +376,7 @@ struct selinux_kernel_status { > } __packed; > > extern void selinux_status_update_setenforce(int enforcing); > -extern void selinux_status_update_policyload(int seqno); > +extern void selinux_status_update_policyload(u32 seqno); > extern void selinux_complete_init(void); > extern struct path selinux_null; > extern void selnl_notify_setenforce(int val); > diff --git a/security/selinux/status.c b/security/selinux/status.c > index 19ef929a075c..e436e4975adc 100644 > --- a/security/selinux/status.c > +++ b/security/selinux/status.c > @@ -101,7 +101,7 @@ void selinux_status_update_setenforce(int enforcing) > * It updates status of the times of policy reloaded, and current > * setting of deny_unknown. > */ > -void selinux_status_update_policyload(int seqno) > +void selinux_status_update_policyload(u32 seqno) > { > struct selinux_kernel_status *status; > > -- > 2.40.1 -- paul-moore.com
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h index 0f93fd019bb4..a16c52d553e1 100644 --- a/security/selinux/include/security.h +++ b/security/selinux/include/security.h @@ -376,7 +376,7 @@ struct selinux_kernel_status { } __packed; extern void selinux_status_update_setenforce(int enforcing); -extern void selinux_status_update_policyload(int seqno); +extern void selinux_status_update_policyload(u32 seqno); extern void selinux_complete_init(void); extern struct path selinux_null; extern void selnl_notify_setenforce(int val); diff --git a/security/selinux/status.c b/security/selinux/status.c index 19ef929a075c..e436e4975adc 100644 --- a/security/selinux/status.c +++ b/security/selinux/status.c @@ -101,7 +101,7 @@ void selinux_status_update_setenforce(int enforcing) * It updates status of the times of policy reloaded, and current * setting of deny_unknown. */ -void selinux_status_update_policyload(int seqno) +void selinux_status_update_policyload(u32 seqno) { struct selinux_kernel_status *status;
Align the type with the one used in selinux_notify_policy_change() and the sequence member of struct selinux_kernel_status. Signed-off-by: Christian Göttsche <cgzones@googlemail.com> --- security/selinux/include/security.h | 2 +- security/selinux/status.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)