X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-ctl%2Fkernel-ctl.c;h=d850f38c0337bdf53bc690f15240a82163ac66f8;hb=ea207e3b32e5159cfd9d1f15c36028bf707fc1ed;hp=e4a268ed48becd506ddbaf955deeacd3ef6d5373;hpb=1be4792f346ea9a05cfc0acd38e295417c67d122;p=lttng-tools.git

diff --git a/src/common/kernel-ctl/kernel-ctl.c b/src/common/kernel-ctl/kernel-ctl.c
index e4a268ed4..d850f38c0 100644
--- a/src/common/kernel-ctl/kernel-ctl.c
+++ b/src/common/kernel-ctl/kernel-ctl.c
@@ -82,7 +82,13 @@ int kernctl_open_metadata(int fd, struct lttng_channel_attr *chops)
 		old_channel.switch_timer_interval = chops->switch_timer_interval;
 		old_channel.read_timer_interval = chops->read_timer_interval;
 		old_channel.output = chops->output;
-		memcpy(old_channel.padding, chops->padding, sizeof(old_channel.padding));
+
+		memset(old_channel.padding, 0, sizeof(old_channel.padding));
+		/*
+		 * The new channel padding is smaller than the old ABI so we use the
+		 * new ABI padding size for the memcpy.
+		 */
+		memcpy(old_channel.padding, chops->padding, sizeof(chops->padding));
 
 		return ioctl(fd, LTTNG_KERNEL_OLD_METADATA, &old_channel);
 	}
@@ -93,7 +99,7 @@ int kernctl_open_metadata(int fd, struct lttng_channel_attr *chops)
 	channel.switch_timer_interval = chops->switch_timer_interval;
 	channel.read_timer_interval = chops->read_timer_interval;
 	channel.output = chops->output;
-	memcpy(channel.padding, chops->padding, sizeof(channel.padding));
+	memcpy(channel.padding, chops->padding, sizeof(chops->padding));
 
 	return ioctl(fd, LTTNG_KERNEL_METADATA, &channel);
 }
@@ -111,7 +117,13 @@ int kernctl_create_channel(int fd, struct lttng_channel_attr *chops)
 		old_channel.switch_timer_interval = chops->switch_timer_interval;
 		old_channel.read_timer_interval = chops->read_timer_interval;
 		old_channel.output = chops->output;
-		memcpy(old_channel.padding, chops->padding, sizeof(old_channel.padding));
+
+		memset(old_channel.padding, 0, sizeof(old_channel.padding));
+		/*
+		 * The new channel padding is smaller than the old ABI so we use the
+		 * new ABI padding size for the memcpy.
+		 */
+		memcpy(old_channel.padding, chops->padding, sizeof(chops->padding));
 
 		return ioctl(fd, LTTNG_KERNEL_OLD_CHANNEL, &old_channel);
 	}
@@ -122,7 +134,7 @@ int kernctl_create_channel(int fd, struct lttng_channel_attr *chops)
 	channel.switch_timer_interval = chops->switch_timer_interval;
 	channel.read_timer_interval = chops->read_timer_interval;
 	channel.output = chops->output;
-	memcpy(channel.padding, chops->padding, sizeof(channel.padding));
+	memcpy(channel.padding, chops->padding, sizeof(chops->padding));
 
 	return ioctl(fd, LTTNG_KERNEL_CHANNEL, &channel);
 }