From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751810AbbJYOa6 (ORCPT ); Sun, 25 Oct 2015 10:30:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53119 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751523AbbJYOaQ (ORCPT ); Sun, 25 Oct 2015 10:30:16 -0400 Date: Sun, 25 Oct 2015 16:26:39 +0100 From: Oleg Nesterov To: Andrew Morton , Markus Pargmann Cc: nbd-general@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH -mm 2/3] nbd: nbd_thread_recv: remove the buggy kernel_dequeue_signal() Message-ID: <20151025152639.GA1402@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151025152625.GA1385@redhat.com> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org nbd_thread_recv() is called by userspace, it is very wrong to dequeue and throw out a signal. I do not understand why nbd_thread_recv() (and nbd_thread_send() btw) does sock_shutdown(); the caller, __nbd_ioctl(NBD_DO_IT) does this too. Signed-off-by: Oleg Nesterov --- drivers/block/nbd.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index e5d96e5..0ffd73c 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -444,9 +444,8 @@ static int nbd_thread_recv(struct nbd_device *nbd) spin_unlock_irqrestore(&nbd->tasks_lock, flags); if (signal_pending(current)) { - ret = kernel_dequeue_signal(NULL); - dev_warn(nbd_to_dev(nbd), "pid %d, %s, got signal %d\n", - task_pid_nr(current), current->comm, ret); + dev_warn(nbd_to_dev(nbd), "pid %d, %s, got signal", + task_pid_nr(current), current->comm); mutex_lock(&nbd->tx_lock); sock_shutdown(nbd); mutex_unlock(&nbd->tx_lock); -- 1.5.5.1