diff mbox

[OpenWrt-Devel,netifd,04/16] tunnel: Fix uninitialized access

Message ID 1454320590-20710-4-git-send-email-dedeckeh@gmail.com
State Accepted
Headers show

Commit Message

Hans Dedecker Feb. 1, 2016, 9:56 a.m. UTC 
Fix tb_dev uninitialized access by device_init_settings

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
---
 tunnel.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/tunnel.c b/tunnel.c
index aa670a3..524fd43 100644
--- a/tunnel.c
+++ b/tunnel.c
@@ -49,12 +49,11 @@  tunnel_reload(struct device *dev, struct blob_attr *attr)
 	if (uci_blob_check_equal(dev->config, attr, cfg))
 		return DEV_CONFIG_NO_CHANGE;
 
-	if (attr) {
-		memset(tb_dev, 0, sizeof(tb_dev));
+	memset(tb_dev, 0, sizeof(tb_dev));
 
+	if (attr)
 		blobmsg_parse(device_attr_list.params, __DEV_ATTR_MAX, tb_dev,
 			blob_data(attr), blob_len(attr));
-	}
 
 	device_init_settings(dev, tb_dev);