From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:55698 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751007AbcCEVKw (ORCPT ); Sat, 5 Mar 2016 16:10:52 -0500 Subject: Patch "ALSA: timer: Fix broken compat timer user status ioctl" has been added to the 4.4-stable tree To: tiwai@suse.de, gregkh@linuxfoundation.org Cc: , From: Date: Sat, 05 Mar 2016 13:10:51 -0800 Message-ID: <145721225117380@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled ALSA: timer: Fix broken compat timer user status ioctl to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: alsa-timer-fix-broken-compat-timer-user-status-ioctl.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 3a72494ac2a3bd229db941d51e7efe2f6ccd947b Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Sun, 28 Feb 2016 11:36:14 +0100 Subject: ALSA: timer: Fix broken compat timer user status ioctl From: Takashi Iwai commit 3a72494ac2a3bd229db941d51e7efe2f6ccd947b upstream. The timer user status compat ioctl returned the bogus struct used for 64bit architectures instead of the 32bit one. This patch addresses it to return the proper struct. Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/core/timer_compat.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/sound/core/timer_compat.c +++ b/sound/core/timer_compat.c @@ -70,13 +70,14 @@ static int snd_timer_user_status_compat( struct snd_timer_status32 __user *_status) { struct snd_timer_user *tu; - struct snd_timer_status status; + struct snd_timer_status32 status; tu = file->private_data; if (snd_BUG_ON(!tu->timeri)) return -ENXIO; memset(&status, 0, sizeof(status)); - status.tstamp = tu->tstamp; + status.tstamp.tv_sec = tu->tstamp.tv_sec; + status.tstamp.tv_nsec = tu->tstamp.tv_nsec; status.resolution = snd_timer_resolution(tu->timeri); status.lost = tu->timeri->lost; status.overrun = tu->overrun; Patches currently in stable-queue which might be from tiwai@suse.de are queue-4.4/alsa-hdspm-fix-zero-division.patch queue-4.4/alsa-ctl-fix-ioctls-for-x32-abi.patch queue-4.4/alsa-hdspm-fix-wrong-boolean-ctl-value-accesses.patch queue-4.4/alsa-pcm-fix-ioctls-for-x32-abi.patch queue-4.4/alsa-hdsp-fix-wrong-boolean-ctl-value-accesses.patch queue-4.4/alsa-seq-oss-don-t-drain-at-closing-a-client.patch queue-4.4/alsa-hda-fix-mic-issues-on-acer-aspire-e1-472.patch queue-4.4/alsa-timer-fix-ioctls-for-x32-abi.patch queue-4.4/alsa-usb-audio-add-a-quirk-for-plantronics-da45.patch queue-4.4/alsa-timer-fix-broken-compat-timer-user-status-ioctl.patch queue-4.4/alsa-rawmidi-fix-ioctls-x32-abi.patch