Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b24e7ad1 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: timer: Fix ioctls for X32 ABI 



X32 ABI takes the 64bit timespec, thus the timer user status ioctl becomes
incompatible with IA32.  This results in NOTTY error when the ioctl is
issued.

Meanwhile, this struct in X32 is essentially identical with the one in
X86-64, so we can just bypassing to the existing code for this
specific compat ioctl.

Cc: <stable@vger.kernel.org> # v3.4+
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 3a72494a

sound/core/timer_compat.c

+13 −0
Original line number Diff line number Diff line
@@ -89,12 +89,21 @@ static int snd_timer_user_status_compat(struct file *file, 
	return 0;

}



#ifdef CONFIG_X86_X32

/* X32 ABI has the same struct as x86-64 */

#define snd_timer_user_status_x32(file, s) \

	snd_timer_user_status(file, s)

#endif /* CONFIG_X86_X32 */



/*

 */



enum {

	SNDRV_TIMER_IOCTL_INFO32 = _IOR('T', 0x11, struct snd_timer_info32),

	SNDRV_TIMER_IOCTL_STATUS32 = _IOW('T', 0x14, struct snd_timer_status32),

#ifdef CONFIG_X86_X32

	SNDRV_TIMER_IOCTL_STATUS_X32 = _IOW('T', 0x14, struct snd_timer_status),

#endif /* CONFIG_X86_X32 */

};



static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg)
@@ -123,6 +132,10 @@ static long snd_timer_user_ioctl_compat(struct file *file, unsigned int cmd, uns 
		return snd_timer_user_info_compat(file, argp);

	case SNDRV_TIMER_IOCTL_STATUS32:

		return snd_timer_user_status_compat(file, argp);

#ifdef CONFIG_X86_X32

	case SNDRV_TIMER_IOCTL_STATUS_X32:

		return snd_timer_user_status_x32(file, argp);

#endif /* CONFIG_X86_X32 */

	}

	return -ENOIOCTLCMD;

}