Skip to content

Commit b9258a2

Browse files
Richard Palethorpedavem330
Richard Palethorpe
authored andcommitted
slcan: Don't transmit uninitialized stack data in padding
struct can_frame contains some padding which is not explicitly zeroed in slc_bump. This uninitialized data will then be transmitted if the stack initialization hardening feature is not enabled (CONFIG_INIT_STACK_ALL). This commit just zeroes the whole struct including the padding. Signed-off-by: Richard Palethorpe <rpalethorpe@suse.com> Fixes: a1044e3 ("can: add slcan driver for serial/USB-serial CAN adapters") Reviewed-by: Kees Cook <keescook@chromium.org> Cc: linux-can@vger.kernel.org Cc: netdev@vger.kernel.org Cc: security@kernel.org Cc: wg@grandegger.com Cc: mkl@pengutronix.de Cc: davem@davemloft.net Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent b1f4c20 commit b9258a2

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

Diff for: drivers/net/can/slcan.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ static void slc_bump(struct slcan *sl)
148148
u32 tmpid;
149149
char *cmd = sl->rbuff;
150150

151-
cf.can_id = 0;
151+
memset(&cf, 0, sizeof(cf));
152152

153153
switch (*cmd) {
154154
case 'r':
@@ -187,8 +187,6 @@ static void slc_bump(struct slcan *sl)
187187
else
188188
return;
189189

190-
*(u64 *) (&cf.data) = 0; /* clear payload */
191-
192190
/* RTR frames may have a dlc > 0 but they never have any data bytes */
193191
if (!(cf.can_id & CAN_RTR_FLAG)) {
194192
for (i = 0; i < cf.can_dlc; i++) {

0 commit comments

Comments
 (0)