mirror of
				https://github.com/torvalds/linux.git
				synced 2025-10-31 08:38:45 +02:00 
			
		
		
		
	pstore/blk: Move verify_size() macro out of function
There's no good reason for the verify_size macro to live inside the function. Move it up with the check_size() macro and fix indenting. Cc: Anton Vorontsov <anton@enomsg.org> Cc: Colin Cross <ccross@android.com> Cc: Tony Luck <tony.luck@intel.com> Signed-off-by: Kees Cook <keescook@chromium.org>
This commit is contained in:
		
							parent
							
								
									6eed261f48
								
							
						
					
					
						commit
						2a03ddbde1
					
				
					 1 changed files with 11 additions and 11 deletions
				
			
		|  | @ -108,6 +108,17 @@ struct bdev_info { | |||
| 	_##name_;						\ | ||||
| }) | ||||
| 
 | ||||
| #define verify_size(name, alignsize, enabled) {			\ | ||||
| 	long _##name_;						\ | ||||
| 	if (enabled)						\ | ||||
| 		_##name_ = check_size(name, alignsize);		\ | ||||
| 	else							\ | ||||
| 		_##name_ = 0;					\ | ||||
| 	/* Synchronize module parameters with resuls. */	\ | ||||
| 	name = _##name_ / 1024;					\ | ||||
| 	pstore_zone_info->name = _##name_;			\ | ||||
| } | ||||
| 
 | ||||
| static int __register_pstore_device(struct pstore_device_info *dev) | ||||
| { | ||||
| 	int ret; | ||||
|  | @ -143,21 +154,10 @@ static int __register_pstore_device(struct pstore_device_info *dev) | |||
| 	if (!dev->flags) | ||||
| 		dev->flags = UINT_MAX; | ||||
| 
 | ||||
| #define verify_size(name, alignsize, enabled) {				\ | ||||
| 		long _##name_;						\ | ||||
| 		if (enabled)						\ | ||||
| 			_##name_ = check_size(name, alignsize);		\ | ||||
| 		else							\ | ||||
| 			_##name_ = 0;					\ | ||||
| 		name = _##name_ / 1024;					\ | ||||
| 		pstore_zone_info->name = _##name_;			\ | ||||
| 	} | ||||
| 
 | ||||
| 	verify_size(kmsg_size, 4096, dev->flags & PSTORE_FLAGS_DMESG); | ||||
| 	verify_size(pmsg_size, 4096, dev->flags & PSTORE_FLAGS_PMSG); | ||||
| 	verify_size(console_size, 4096, dev->flags & PSTORE_FLAGS_CONSOLE); | ||||
| 	verify_size(ftrace_size, 4096, dev->flags & PSTORE_FLAGS_FTRACE); | ||||
| #undef verify_size | ||||
| 
 | ||||
| 	pstore_zone_info->total_size = dev->total_size; | ||||
| 	pstore_zone_info->max_reason = max_reason; | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue
	
	 Kees Cook
						Kees Cook