mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	devlink: double free in devlink_resource_fill()
Smatch reports that devlink_dpipe_send_and_alloc_skb() frees the skb on error so this is a double free. We fixed a bunch of these bugs in commit7fe4d6dcbc("devlink: Remove redundant free on error path") but we accidentally overlooked this one. Fixes:d9f9b9a4d0("devlink: Add support for resource abstraction") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
		
							parent
							
								
									e6ce3822a9
								
							
						
					
					
						commit
						83fe9a9661
					
				
					 1 changed files with 1 additions and 2 deletions
				
			
		| 
						 | 
					@ -2592,7 +2592,7 @@ static int devlink_resource_fill(struct genl_info *info,
 | 
				
			||||||
	if (!nlh) {
 | 
						if (!nlh) {
 | 
				
			||||||
		err = devlink_dpipe_send_and_alloc_skb(&skb, info);
 | 
							err = devlink_dpipe_send_and_alloc_skb(&skb, info);
 | 
				
			||||||
		if (err)
 | 
							if (err)
 | 
				
			||||||
			goto err_skb_send_alloc;
 | 
								return err;
 | 
				
			||||||
		goto send_done;
 | 
							goto send_done;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	return genlmsg_reply(skb, info);
 | 
						return genlmsg_reply(skb, info);
 | 
				
			||||||
| 
						 | 
					@ -2600,7 +2600,6 @@ static int devlink_resource_fill(struct genl_info *info,
 | 
				
			||||||
nla_put_failure:
 | 
					nla_put_failure:
 | 
				
			||||||
	err = -EMSGSIZE;
 | 
						err = -EMSGSIZE;
 | 
				
			||||||
err_resource_put:
 | 
					err_resource_put:
 | 
				
			||||||
err_skb_send_alloc:
 | 
					 | 
				
			||||||
	nlmsg_free(skb);
 | 
						nlmsg_free(skb);
 | 
				
			||||||
	return err;
 | 
						return err;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue