[PATCH] ALSA: us122l: fix missing unlock in usb_stream_hwdep_vm_fault()

[PATCH] ALSA: us122l: fix missing unlock in usb_stream_hwdep_vm_fault()

[Li Zefan]

Should unlock us122l->mutex before returning VM_FAULT_SIGBUS.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
 sound/usb/usx2y/us122l.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c
index b441fe2..c2515b6 100644
--- a/sound/usb/usx2y/us122l.c
+++ b/sound/usb/usx2y/us122l.c
@@ -118,12 +118,11 @@ static int usb_stream_hwdep_vm_fault(struct vm_area_struct *area,
 	void *vaddr;
 	struct us122l *us122l = area->vm_private_data;
 	struct usb_stream *s;
-	int vm_f = VM_FAULT_SIGBUS;
 
 	mutex_lock(&us122l->mutex);
 	s = us122l->sk.s;
 	if (!s)
-		goto out;
+		goto unlock;
 
 	offset = vmf->pgoff << PAGE_SHIFT;
 	if (offset < PAGE_ALIGN(s->read_size))
@@ -131,7 +130,7 @@ static int usb_stream_hwdep_vm_fault(struct vm_area_struct *area,
 	else {
 		offset -= PAGE_ALIGN(s->read_size);
 		if (offset >= PAGE_ALIGN(s->write_size))
-			goto out;
+			goto unlock;
 
 		vaddr = us122l->sk.write_page + offset;
 	}
@@ -141,9 +140,11 @@ static int usb_stream_hwdep_vm_fault(struct vm_area_struct *area,
 	mutex_unlock(&us122l->mutex);
 
 	vmf->page = page;
-	vm_f = 0;
-out:
-	return vm_f;
+
+	return 0;
+unlock:
+	mutex_unlock(&us122l->mutex);
+	return VM_FAULT_SIGBUS;
 }
 
 static void usb_stream_hwdep_vm_close(struct vm_area_struct *area)
-- 
1.5.4.rc3

Re: [PATCH] ALSA: us122l: fix missing unlock in usb_stream_hwdep_vm_fault()

[Takashi Iwai]

At Wed, 15 Oct 2008 10:07:23 +0800,
Li Zefan wrote:
> 
> Should unlock us122l->mutex before returning VM_FAULT_SIGBUS.
> 
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>

Thanks, applied now.
Will be included in the next pull request.


Takashi

> ---
>  sound/usb/usx2y/us122l.c |   13 +++++++------
>  1 files changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c
> index b441fe2..c2515b6 100644
> --- a/sound/usb/usx2y/us122l.c
> +++ b/sound/usb/usx2y/us122l.c
> @@ -118,12 +118,11 @@ static int usb_stream_hwdep_vm_fault(struct vm_area_struct *area,
>  	void *vaddr;
>  	struct us122l *us122l = area->vm_private_data;
>  	struct usb_stream *s;
> -	int vm_f = VM_FAULT_SIGBUS;
>  
>  	mutex_lock(&us122l->mutex);
>  	s = us122l->sk.s;
>  	if (!s)
> -		goto out;
> +		goto unlock;
>  
>  	offset = vmf->pgoff << PAGE_SHIFT;
>  	if (offset < PAGE_ALIGN(s->read_size))
> @@ -131,7 +130,7 @@ static int usb_stream_hwdep_vm_fault(struct vm_area_struct *area,
>  	else {
>  		offset -= PAGE_ALIGN(s->read_size);
>  		if (offset >= PAGE_ALIGN(s->write_size))
> -			goto out;
> +			goto unlock;
>  
>  		vaddr = us122l->sk.write_page + offset;
>  	}
> @@ -141,9 +140,11 @@ static int usb_stream_hwdep_vm_fault(struct vm_area_struct *area,
>  	mutex_unlock(&us122l->mutex);
>  
>  	vmf->page = page;
> -	vm_f = 0;
> -out:
> -	return vm_f;
> +
> +	return 0;
> +unlock:
> +	mutex_unlock(&us122l->mutex);
> +	return VM_FAULT_SIGBUS;
>  }
>  
>  static void usb_stream_hwdep_vm_close(struct vm_area_struct *area)
> -- 
> 1.5.4.rc3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>