mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	tracing/probe: Check the size of argument name and body
Check the size of argument name and expression is not 0 and smaller than maximum length. Link: http://lkml.kernel.org/r/155253783029.14922.12650939303827581096.stgit@devnote2 Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
		
							parent
							
								
									dec65d79fd
								
							
						
					
					
						commit
						b4443c17a3
					
				
					 2 changed files with 3 additions and 0 deletions
				
			
		| 
						 | 
					@ -554,6 +554,8 @@ int traceprobe_parse_probe_arg(struct trace_probe *tp, int i, char *arg,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	body = strchr(arg, '=');
 | 
						body = strchr(arg, '=');
 | 
				
			||||||
	if (body) {
 | 
						if (body) {
 | 
				
			||||||
 | 
							if (body - arg > MAX_ARG_NAME_LEN || body == arg)
 | 
				
			||||||
 | 
								return -EINVAL;
 | 
				
			||||||
		parg->name = kmemdup_nul(arg, body - arg, GFP_KERNEL);
 | 
							parg->name = kmemdup_nul(arg, body - arg, GFP_KERNEL);
 | 
				
			||||||
		body++;
 | 
							body++;
 | 
				
			||||||
	} else {
 | 
						} else {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -32,6 +32,7 @@
 | 
				
			||||||
#define MAX_TRACE_ARGS		128
 | 
					#define MAX_TRACE_ARGS		128
 | 
				
			||||||
#define MAX_ARGSTR_LEN		63
 | 
					#define MAX_ARGSTR_LEN		63
 | 
				
			||||||
#define MAX_ARRAY_LEN		64
 | 
					#define MAX_ARRAY_LEN		64
 | 
				
			||||||
 | 
					#define MAX_ARG_NAME_LEN	32
 | 
				
			||||||
#define MAX_STRING_SIZE		PATH_MAX
 | 
					#define MAX_STRING_SIZE		PATH_MAX
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Reserved field names */
 | 
					/* Reserved field names */
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue