From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E3F8C433E7 for ; Mon, 12 Oct 2020 13:56:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3119D2074F for ; Mon, 12 Oct 2020 13:56:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602511010; bh=3DrKcRe3aNaVQDELlKhC+Gj/MPcIqbyiT/Nvd5WmGew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2McYZ4mffht8bOWgIOQpLKivC1/PrGMbvmTSuFhr+hJOobmQkkMSanTOw4PvKBEme DweMSNZ8hsGhuJNjXlPcTZWIFfbxtoz2ry4vbCRvz8IefHERABMwJVBUneaV4NPfyJ efQKYx2CdlO5SxG7TPRSg7DybAz5y+YrGOYdL27w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389451AbgJLN4t (ORCPT ); Mon, 12 Oct 2020 09:56:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:48360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389426AbgJLNoE (ORCPT ); Mon, 12 Oct 2020 09:44:04 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BC87E221FF; Mon, 12 Oct 2020 13:43:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602510234; bh=3DrKcRe3aNaVQDELlKhC+Gj/MPcIqbyiT/Nvd5WmGew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LcahmIPjOohYYgb4XdUB1/t56U2joXFm6W95d/qheL8/coY563nAx0sN14xlKPvrd Hh9QuSyPYfBTZvVHECtgveu82FKRVFxLmug3JeF4qrfMBdLv2BZfvHDUjvr1frBOGx HOVi2JW4kBqEEC0dDrkwyCmcveh5MlbHJ4hSjDpY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Arnd Bergmann , syzbot+85433a479a646a064ab3@syzkaller.appspotmail.com, Peilin Ye , Jens Axboe Subject: [PATCH 5.8 012/124] block/scsi-ioctl: Fix kernel-infoleak in scsi_put_cdrom_generic_arg() Date: Mon, 12 Oct 2020 15:30:16 +0200 Message-Id: <20201012133147.448170605@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201012133146.834528783@linuxfoundation.org> References: <20201012133146.834528783@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peilin Ye commit 6d53a9fe5a1983490bc14b3a64d49fabb4ccc651 upstream. scsi_put_cdrom_generic_arg() is copying uninitialized stack memory to userspace, since the compiler may leave a 3-byte hole in the middle of `cgc32`. Fix it by adding a padding field to `struct compat_cdrom_generic_command`. Cc: stable@vger.kernel.org Fixes: f3ee6e63a9df ("compat_ioctl: move CDROM_SEND_PACKET handling into scsi") Suggested-by: Dan Carpenter Suggested-by: Arnd Bergmann Reported-by: syzbot+85433a479a646a064ab3@syzkaller.appspotmail.com Signed-off-by: Peilin Ye Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- block/scsi_ioctl.c | 1 + 1 file changed, 1 insertion(+) --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -651,6 +651,7 @@ struct compat_cdrom_generic_command { compat_int_t stat; compat_caddr_t sense; unsigned char data_direction; + unsigned char pad[3]; compat_int_t quiet; compat_int_t timeout; compat_caddr_t reserved[1];