block: fix part_pack_uuid() build error
Subsystems (4)
PATCH 1/1 block: fix part_pack_uuid() build error
Fix a build error when CONFIG_BLOCK is not enabled, by defining a wrapper called blk_part_pack_uuid(). The wrapper returns -EINVAL, when CONFIG_BLOCK is not defined.
security/integrity/ima/ima_policy.c:538:4: error: implicit declaration of function 'part_pack_uuid' [-Werror=implicit-function-declaration]
Changleog v1:
- rename ima_part_pack_uuid() to blk_part_pack_uuid()
- resolve scripts/checkpatch.pl warnings Changelog v0:
- fix UUID scripts/Lindent msgs
--- include/linux/genhd.h | 10 ++++++++++ security/integrity/ima/ima_policy.c | 11 ++++++----- 2 files changed, 16 insertions(+), 5 deletions(-)
include/linux/genhd.h +10 -0
@@ -231,6 +231,12 @@ static inline void part_pack_uuid(const u8 *uuid_str, u8 *to) } } +static inline int blk_part_pack_uuid (const u8 *uuid_str,u8 *to) +{ +part_pack_uuid (uuid_str, to); +return 0 ; +} +static inline int disk_max_parts (struct gendisk *disk) {if (disk->flags &GENHD_FL_EXT_DEVT )
@@ -718,6 +724,10 @@ static inline dev_t blk_lookup_devt(const char *name, int partno)return devt; } +static inline int blk_part_pack_uuid (const u8 *uuid_str,u8 *to) +{ +return -EINVAL ; +}#endif /* CONFIG_BLOCK */ #endif /* _LINUX_GENHD_H */
security/integrity/ima/ima_policy.c +6 -5
@@ -176,7 +176,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, && rule->fsmagic != inode->i_sb->s_magic)return false;if ((rule->flags &IMA_FSUUID ) && -memcmp (rule->fsuuid, inode->i_sb->s_uuid,sizeof (rule->fsuuid))) +memcmp (rule->fsuuid, inode->i_sb->s_uuid,sizeof (rule->fsuuid)))return false;if ((rule->flags &IMA_UID ) && !uid_eq (rule->uid, cred->uid))return false;
@@ -530,14 +530,15 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)ima_log_string (ab,"fsuuid" , args[0 ].from);if (memchr_inv (entry->fsuuid,0x00 , -sizeof (entry->fsuuid))) { +sizeof (entry->fsuuid))) { result = -EINVAL ;break ; } -part_pack_uuid (args[0 ].from, entry->fsuuid); - entry->flags |=IMA_FSUUID ; - result =0 ; + result =blk_part_pack_uuid (args[0 ].from, + entry->fsuuid); +if (!result) + entry->flags |=IMA_FSUUID ;break ;case Opt_uid:ima_log_string (ab,"uid" , args[0 ].from);
Signature · 1 line
1.8.1.rc3
Quoted 13 lines · Mimi Zohar
Fix a build error when
CONFIG_BLOCKis not enabled, by defining a wrapper calledblk_part_pack_uuid(). The wrapper returns-EINVAL, whenCONFIG_BLOCKis not defined.
security/integrity/ima/ima_policy.c:538:4: error: implicit declaration of function 'part_pack_uuid' [-Werror=implicit-function-declaration]Changleog v1:
- renameima_part_pack_uuid()toblk_part_pack_uuid()
- resolvescripts/checkpatch.plwarnings Changelog v0:
- fix UUIDscripts/Lindentmsgs
Quoted 3 lines
Reported-by Randy Dunlap <[email protected]>Reported-by David Rientjes <[email protected]>Signed-off-by Mimi Zohar <[email protected]>
Quoted 13 lines · Mimi Zohar
Fix a build error when
CONFIG_BLOCKis not enabled, by defining a wrapper calledblk_part_pack_uuid(). The wrapper returns-EINVAL, whenCONFIG_BLOCKis not defined.
security/integrity/ima/ima_policy.c:538:4: error: implicit declaration of function 'part_pack_uuid' [-Werror=implicit-function-declaration]Changleog v1:
- renameima_part_pack_uuid()toblk_part_pack_uuid()
- resolvescripts/checkpatch.plwarnings Changelog v0:
- fix UUIDscripts/Lindentmsgs
Quoted 3 lines
Reported-by Randy Dunlap <[email protected]>Reported-by David Rientjes <[email protected]>Signed-off-by Mimi Zohar <[email protected]>
Thanks.
Quoted 67 lines
--- include/linux/genhd.h | 10 ++++++++++ security/integrity/ima/ima_policy.c | 11 ++++++----- 2 files changed, 16 insertions(+), 5 deletions(-)include/linux/genhd.h +10
-0@@ -231,6 +231,12 @@ static inline void part_pack_uuid(const u8 *uuid_str, u8 *to) } } +static inline int blk_part_pack_uuid (const u8 *uuid_str,u8 *to) +{ +part_pack_uuid (uuid_str, to); +return 0 ; +} +static inline int disk_max_parts (struct gendisk *disk) {if (disk->flags &GENHD_FL_EXT_DEVT )@@ -718,6 +724,10 @@ static inline dev_t blk_lookup_devt(const char *name, int partno)return devt; } +static inline int blk_part_pack_uuid (const u8 *uuid_str,u8 *to) +{ +return -EINVAL ; +}#endif /* CONFIG_BLOCK */ #endif /* _LINUX_GENHD_H */ security/integrity/ima/ima_policy.c +6
-5@@ -176,7 +176,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, && rule->fsmagic != inode->i_sb->s_magic)return false;if ((rule->flags &IMA_FSUUID ) && -memcmp (rule->fsuuid, inode->i_sb->s_uuid,sizeof (rule->fsuuid))) +memcmp (rule->fsuuid, inode->i_sb->s_uuid,sizeof (rule->fsuuid)))return false;if ((rule->flags &IMA_UID ) && !uid_eq (rule->uid, cred->uid))return false;@@ -530,14 +530,15 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)ima_log_string (ab,"fsuuid" , args[0 ].from);if (memchr_inv (entry->fsuuid,0x00 , -sizeof (entry->fsuuid))) { +sizeof (entry->fsuuid))) { result = -EINVAL ;break ; } -part_pack_uuid (args[0 ].from, entry->fsuuid); - entry->flags |=IMA_FSUUID ; - result =0 ; + result =blk_part_pack_uuid (args[0 ].from, + entry->fsuuid); +if (!result) + entry->flags |=IMA_FSUUID ;break ;case Opt_uid:ima_log_string (ab,"uid" , args[0 ].from);
Signature · 1 line
~Randy
James Morris
maintainerQuoted 3 lines · Mimi Zohar
Fix a build error when
CONFIG_BLOCKis not enabled, by defining a wrapper calledblk_part_pack_uuid(). The wrapper returns-EINVAL, whenCONFIG_BLOCKis not defined.
Please indicate which tree your patches are intended for, also noting specific regression details if any (e.g. which commit introduced it).
Signature · 2 lines
James Morris <[email protected]>
Quoted 19 lines · On Sun, 24 Feb 2013 10:15:44 -0500 Mimi Zohar <[email protected]> wrote:
Fix a build error when
CONFIG_BLOCKis not enabled, by defining a wrapper calledblk_part_pack_uuid(). The wrapper returns-EINVAL, whenCONFIG_BLOCKis not defined.
security/integrity/ima/ima_policy.c:538:4: error: implicit declaration of function 'part_pack_uuid' [-Werror=implicit-function-declaration]...
security/integrity/ima/ima_policy.c +1
-1ima_log_string (ab,"fsuuid" , args[0 ].from);if (memchr_inv (entry->fsuuid,0x00 , -sizeof (entry->fsuuid))) { +sizeof (entry->fsuuid))) { result = -EINVAL ;
security/integrity/ima/ima_policy.c static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) · line 541
Quoted 10 lines
security/integrity/ima/ima_policy.c +4
-3break ; } -part_pack_uuid (args[0 ].from, entry->fsuuid); - entry->flags |=IMA_FSUUID ; - result =0 ; + result =blk_part_pack_uuid (args[0 ].from, + entry->fsuuid); +if (!result) + entry->flags |=IMA_FSUUID ;
This will cause ima_parse_rule() to newly return -EINVAL if the fsuuid= option is used when CONFIG_BLOCK=n.
This functional change was not changelogged, forcing me to ask: was it deliberate or was it accidental?
And it is a non-back-compatible change, introducing some potential to break existing userspace code. Is the risk considered acceptable? If so, why?
Quoted 36 lines · On Mon, 25 Feb 2013 15:16:38 -0800 Andrew Morton <[email protected]>…
Quoted 19 lines · On Sun, 24 Feb 2013 10:15:44 -0500 Mimi Zohar <[email protected]> wrote:
Fix a build error when
CONFIG_BLOCKis not enabled, by defining a wrapper calledblk_part_pack_uuid(). The wrapper returns-EINVAL, whenCONFIG_BLOCKis not defined.
security/integrity/ima/ima_policy.c:538:4: error: implicit declaration of function 'part_pack_uuid' [-Werror=implicit-function-declaration]...
security/integrity/ima/ima_policy.c +1
-1ima_log_string (ab,"fsuuid" , args[0 ].from);if (memchr_inv (entry->fsuuid,0x00 , -sizeof (entry->fsuuid))) { +sizeof (entry->fsuuid))) { result = -EINVAL ;security/integrity/ima/ima_policy.c static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) · line 541
Quoted 10 lines
security/integrity/ima/ima_policy.c +4
-3break ; } -part_pack_uuid (args[0 ].from, entry->fsuuid); - entry->flags |=IMA_FSUUID ; - result =0 ; + result =blk_part_pack_uuid (args[0 ].from, + entry->fsuuid); +if (!result) + entry->flags |=IMA_FSUUID ;This will cause
ima_parse_rule()to newly return-EINVALif the fsuuid= option is used whenCONFIG_BLOCK=n.
Quoted 6 lines
This functional change was not changelogged, forcing me to ask: was it deliberate or was it accidental?
And it is a non-back-compatible change, introducing some potential to break existing userspace code. Is the risk considered acceptable? If so, why?
ah, I see that the fsuuid stuff is new in 3.9, so there are no issues.