On 3/2/2026 12:25 PM, Jeff Layton wrote: > Now that i_ino is u64 and the PRIino format macro has been removed, > replace all uses in security with the concrete format strings. > > Signed-off-by: Jeff Layton <[email protected]>
For the security/smack changes: Acked-by: Casey Schaufler <[email protected]> > --- > security/apparmor/apparmorfs.c | 4 ++-- > security/integrity/integrity_audit.c | 2 +- > security/ipe/audit.c | 2 +- > security/lsm_audit.c | 10 +++++----- > security/selinux/hooks.c | 10 +++++----- > security/smack/smack_lsm.c | 12 ++++++------ > 6 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c > index > be343479f80b71566be6fda90fc4e00912faad63..7b645f40e71c956f216fa6a7d69c3ecd4e2a5ff4 > 100644 > --- a/security/apparmor/apparmorfs.c > +++ b/security/apparmor/apparmorfs.c > @@ -149,7 +149,7 @@ static int aafs_count; > > static int aafs_show_path(struct seq_file *seq, struct dentry *dentry) > { > - seq_printf(seq, "%s:[%" PRIino "u]", AAFS_NAME, d_inode(dentry)->i_ino); > + seq_printf(seq, "%s:[%llu]", AAFS_NAME, d_inode(dentry)->i_ino); > return 0; > } > > @@ -2644,7 +2644,7 @@ static int policy_readlink(struct dentry *dentry, char > __user *buffer, > char name[32]; > int res; > > - res = snprintf(name, sizeof(name), "%s:[%" PRIino "u]", AAFS_NAME, > + res = snprintf(name, sizeof(name), "%s:[%llu]", AAFS_NAME, > d_inode(dentry)->i_ino); > if (res > 0 && res < sizeof(name)) > res = readlink_copy(buffer, buflen, name, strlen(name)); > diff --git a/security/integrity/integrity_audit.c > b/security/integrity/integrity_audit.c > index > d28dac23a4e7cf651856b80ab7756d250187ccde..d8d9e5ff1cd22b091f462d1e83d28d2d6bd983e9 > 100644 > --- a/security/integrity/integrity_audit.c > +++ b/security/integrity/integrity_audit.c > @@ -62,7 +62,7 @@ void integrity_audit_message(int audit_msgno, struct inode > *inode, > if (inode) { > audit_log_format(ab, " dev="); > audit_log_untrustedstring(ab, inode->i_sb->s_id); > - audit_log_format(ab, " ino=%" PRIino "u", inode->i_ino); > + audit_log_format(ab, " ino=%llu", inode->i_ino); > } > audit_log_format(ab, " res=%d errno=%d", !result, errno); > audit_log_end(ab); > diff --git a/security/ipe/audit.c b/security/ipe/audit.c > index > 0de95dd4fbea15d4d913fc42e197c3120a9d24a0..93fb59fbddd60b56c0b22be2a38b809ef9e18b76 > 100644 > --- a/security/ipe/audit.c > +++ b/security/ipe/audit.c > @@ -153,7 +153,7 @@ void ipe_audit_match(const struct ipe_eval_ctx *const ctx, > if (inode) { > audit_log_format(ab, " dev="); > audit_log_untrustedstring(ab, inode->i_sb->s_id); > - audit_log_format(ab, " ino=%" PRIino "u", inode->i_ino); > + audit_log_format(ab, " ino=%llu", inode->i_ino); > } else { > audit_log_format(ab, " dev=? ino=?"); > } > diff --git a/security/lsm_audit.c b/security/lsm_audit.c > index > 523f2ee116f0f928003aec30a105d6d4ecb49b0b..737f5a263a8f79416133315edf363ece3d79c722 > 100644 > --- a/security/lsm_audit.c > +++ b/security/lsm_audit.c > @@ -202,7 +202,7 @@ void audit_log_lsm_data(struct audit_buffer *ab, > if (inode) { > audit_log_format(ab, " dev="); > audit_log_untrustedstring(ab, inode->i_sb->s_id); > - audit_log_format(ab, " ino=%" PRIino "u", inode->i_ino); > + audit_log_format(ab, " ino=%llu", inode->i_ino); > } > break; > } > @@ -215,7 +215,7 @@ void audit_log_lsm_data(struct audit_buffer *ab, > if (inode) { > audit_log_format(ab, " dev="); > audit_log_untrustedstring(ab, inode->i_sb->s_id); > - audit_log_format(ab, " ino=%" PRIino "u", inode->i_ino); > + audit_log_format(ab, " ino=%llu", inode->i_ino); > } > break; > } > @@ -228,7 +228,7 @@ void audit_log_lsm_data(struct audit_buffer *ab, > if (inode) { > audit_log_format(ab, " dev="); > audit_log_untrustedstring(ab, inode->i_sb->s_id); > - audit_log_format(ab, " ino=%" PRIino "u", inode->i_ino); > + audit_log_format(ab, " ino=%llu", inode->i_ino); > } > > audit_log_format(ab, " ioctlcmd=0x%hx", a->u.op->cmd); > @@ -246,7 +246,7 @@ void audit_log_lsm_data(struct audit_buffer *ab, > if (inode) { > audit_log_format(ab, " dev="); > audit_log_untrustedstring(ab, inode->i_sb->s_id); > - audit_log_format(ab, " ino=%" PRIino "u", inode->i_ino); > + audit_log_format(ab, " ino=%llu", inode->i_ino); > } > break; > } > @@ -265,7 +265,7 @@ void audit_log_lsm_data(struct audit_buffer *ab, > } > audit_log_format(ab, " dev="); > audit_log_untrustedstring(ab, inode->i_sb->s_id); > - audit_log_format(ab, " ino=%" PRIino "u", inode->i_ino); > + audit_log_format(ab, " ino=%llu", inode->i_ino); > rcu_read_unlock(); > break; > } > diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c > index > 9430f44c81447708c67ddc35c5b4254f16731b8f..8f38de4d223ea59cfea6bbe73747d7b228e0c33f > 100644 > --- a/security/selinux/hooks.c > +++ b/security/selinux/hooks.c > @@ -1400,7 +1400,7 @@ static int inode_doinit_use_xattr(struct inode *inode, > struct dentry *dentry, > if (rc < 0) { > kfree(context); > if (rc != -ENODATA) { > - pr_warn("SELinux: %s: getxattr returned %d for dev=%s > ino=%" PRIino "u\n", > + pr_warn("SELinux: %s: getxattr returned %d for dev=%s > ino=%llu\n", > __func__, -rc, inode->i_sb->s_id, inode->i_ino); > return rc; > } > @@ -1412,13 +1412,13 @@ static int inode_doinit_use_xattr(struct inode > *inode, struct dentry *dentry, > def_sid, GFP_NOFS); > if (rc) { > char *dev = inode->i_sb->s_id; > - kino_t ino = inode->i_ino; > + u64 ino = inode->i_ino; > > if (rc == -EINVAL) { > - pr_notice_ratelimited("SELinux: inode=%" PRIino "u on > dev=%s was found to have an invalid context=%s. This indicates you may need > to relabel the inode or the filesystem in question.\n", > + pr_notice_ratelimited("SELinux: inode=%llu on dev=%s > was found to have an invalid context=%s. This indicates you may need to > relabel the inode or the filesystem in question.\n", > ino, dev, context); > } else { > - pr_warn("SELinux: %s: context_to_sid(%s) returned %d > for dev=%s ino=%" PRIino "u\n", > + pr_warn("SELinux: %s: context_to_sid(%s) returned %d > for dev=%s ino=%llu\n", > __func__, context, -rc, dev, ino); > } > } > @@ -3477,7 +3477,7 @@ static void selinux_inode_post_setxattr(struct dentry > *dentry, const char *name, > &newsid); > if (rc) { > pr_err("SELinux: unable to map context to SID" > - "for (%s, %" PRIino "u), rc=%d\n", > + "for (%s, %llu), rc=%d\n", > inode->i_sb->s_id, inode->i_ino, -rc); > return; > } > diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c > index > 22b6bd322840c82697c38c07b19a4677e7da2598..2eb3368a3632b836df54ba8628c16f7215ddf3ea > 100644 > --- a/security/smack/smack_lsm.c > +++ b/security/smack/smack_lsm.c > @@ -182,7 +182,7 @@ static int smk_bu_inode(struct inode *inode, int mode, > int rc) > char acc[SMK_NUM_ACCESS_TYPE + 1]; > > if (isp->smk_flags & SMK_INODE_IMPURE) > - pr_info("Smack Unconfined Corruption: inode=(%s %" PRIino "u) > %s\n", > + pr_info("Smack Unconfined Corruption: inode=(%s %llu) %s\n", > inode->i_sb->s_id, inode->i_ino, current->comm); > > if (rc <= 0) > @@ -195,7 +195,7 @@ static int smk_bu_inode(struct inode *inode, int mode, > int rc) > > smk_bu_mode(mode, acc); > > - pr_info("Smack %s: (%s %s %s) inode=(%s %" PRIino "u) %s\n", > smk_bu_mess[rc], > + pr_info("Smack %s: (%s %s %s) inode=(%s %llu) %s\n", smk_bu_mess[rc], > tsp->smk_task->smk_known, isp->smk_inode->smk_known, acc, > inode->i_sb->s_id, inode->i_ino, current->comm); > return 0; > @@ -214,7 +214,7 @@ static int smk_bu_file(struct file *file, int mode, int > rc) > char acc[SMK_NUM_ACCESS_TYPE + 1]; > > if (isp->smk_flags & SMK_INODE_IMPURE) > - pr_info("Smack Unconfined Corruption: inode=(%s %" PRIino "u) > %s\n", > + pr_info("Smack Unconfined Corruption: inode=(%s %llu) %s\n", > inode->i_sb->s_id, inode->i_ino, current->comm); > > if (rc <= 0) > @@ -223,7 +223,7 @@ static int smk_bu_file(struct file *file, int mode, int > rc) > rc = 0; > > smk_bu_mode(mode, acc); > - pr_info("Smack %s: (%s %s %s) file=(%s %" PRIino "u %pD) %s\n", > smk_bu_mess[rc], > + pr_info("Smack %s: (%s %s %s) file=(%s %llu %pD) %s\n", smk_bu_mess[rc], > sskp->smk_known, smk_of_inode(inode)->smk_known, acc, > inode->i_sb->s_id, inode->i_ino, file, > current->comm); > @@ -244,7 +244,7 @@ static int smk_bu_credfile(const struct cred *cred, > struct file *file, > char acc[SMK_NUM_ACCESS_TYPE + 1]; > > if (isp->smk_flags & SMK_INODE_IMPURE) > - pr_info("Smack Unconfined Corruption: inode=(%s %" PRIino "u) > %s\n", > + pr_info("Smack Unconfined Corruption: inode=(%s %llu) %s\n", > inode->i_sb->s_id, inode->i_ino, current->comm); > > if (rc <= 0) > @@ -253,7 +253,7 @@ static int smk_bu_credfile(const struct cred *cred, > struct file *file, > rc = 0; > > smk_bu_mode(mode, acc); > - pr_info("Smack %s: (%s %s %s) file=(%s %" PRIino "u %pD) %s\n", > smk_bu_mess[rc], > + pr_info("Smack %s: (%s %s %s) file=(%s %llu %pD) %s\n", smk_bu_mess[rc], > sskp->smk_known, smk_of_inode(inode)->smk_known, acc, > inode->i_sb->s_id, inode->i_ino, file, > current->comm); >
