From patchwork Wed Jan 9 07:25:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 10753541 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4CF0E6C2 for ; Wed, 9 Jan 2019 07:26:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 28B0A2018F for ; Wed, 9 Jan 2019 07:26:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 159A228B09; Wed, 9 Jan 2019 07:26:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A54FA2018F for ; Wed, 9 Jan 2019 07:26:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729971AbfAIH0M (ORCPT ); Wed, 9 Jan 2019 02:26:12 -0500 Received: from mta-p8.oit.umn.edu ([134.84.196.208]:48482 "EHLO mta-p8.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729873AbfAIH0H (ORCPT ); Wed, 9 Jan 2019 02:26:07 -0500 Received: from localhost (unknown [127.0.0.1]) by mta-p8.oit.umn.edu (Postfix) with ESMTP id 2BD6FB2C for ; Wed, 9 Jan 2019 07:26:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p8.oit.umn.edu ([127.0.0.1]) by localhost (mta-p8.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xWN5rgl3U4RP for ; Wed, 9 Jan 2019 01:26:05 -0600 (CST) Received: from mail-it1-f200.google.com (mail-it1-f200.google.com [209.85.166.200]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p8.oit.umn.edu (Postfix) with ESMTPS id 01F8FA9A for ; Wed, 9 Jan 2019 01:26:04 -0600 (CST) Received: by mail-it1-f200.google.com with SMTP id w15so6383553ita.1 for ; Tue, 08 Jan 2019 23:26:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0Yj8Db8wXhEA1gYEAoxbFmsOXCni4n6GcIt+AD7Uyps=; b=Ly+8Vl3ZSBnaiKK2gMYiZJiB8vLlhJF4tmuSPeVc4nS8nT2rC9APQZMewKoPkUxT5q LJJDj6+7Zru+3lnbSECfgV0mNBZ9RKYX3RaOYnPAel/bpeM4zQEIkYLOdvMrku7FFZ93 cIMx6QalqJ1/cikSFk60qAOUTmxqTMN33Xl9RMe9+9/V/Y0tsxzh5nI/WtXU+KHvFyfP 2mVXHlBI5QorHQTDJxTU+PZ0AAE8O/nyvirPebkAALCO4ZKykTetrisEhKhFc/pqLiOd rmPeMjEVivx7PPYM2BicdaCsyHlkyQiCRWab9Q+9s25wYPTiSzky/uad5ggVYk77e4JE yZtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0Yj8Db8wXhEA1gYEAoxbFmsOXCni4n6GcIt+AD7Uyps=; b=E2L76rQNQsYDmMRbdp4VLmuVuRt/S31G84K2F8C2GpUuCLYgSHSAglG9XnpyeJAtC3 HF9Vllk2YGnKsu/GEr1A/eDbTMs/qBdi1ksSItsktyq4DKfBArzLUxNG1GDJg7JUDT1n qm0wKdmXmuzNJwFPy+g16toj8ahpb/mSbzsnRElS4g6gbFDPXJjiKOd6IvufX9j8gm3+ 7wAq4XeFOWkMrlWZYJe5lMLF0dfIu+x6GdmdyMx6CocgXStpcPd1+LSSBu4dn8o34V8s cS2vFTljQd9Wq4ICzAVMJ+vfB912dLRiUJ8Eb/zHn+Y9VwK+XQXQ62uiErhRxrqpwFFF XrBg== X-Gm-Message-State: AJcUuke3Erce9JfJ0uFMLcsYFV6SPA/5xje2T4HpaFzRa3DJ2uJLDjFz JAUEv2uMEk7vccGBTpxb4+ZDQbbhJM+s7BPmcr5FhABnPwBmpkLK1wOK4Wb506RG5OG/9YOy/Dp d3nEEvAS39Qbvvu4fGhyG8nEoXg== X-Received: by 2002:a24:4016:: with SMTP id n22mr3845761ita.25.1547018764606; Tue, 08 Jan 2019 23:26:04 -0800 (PST) X-Google-Smtp-Source: ALg8bN4a5046UyTA3tO1QrimZRmm0/+4RsxL0uLMteY53yOyuJ6SKxRhhXjRz/24ZEgfixvLzW/nsA== X-Received: by 2002:a24:4016:: with SMTP id n22mr3845754ita.25.1547018764329; Tue, 08 Jan 2019 23:26:04 -0800 (PST) Received: from bee.cs.umn.edu (cs-bee0u.cs.umn.edu. [134.84.121.28]) by smtp.gmail.com with ESMTPSA id b73sm459931itd.0.2019.01.08.23.26.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Jan 2019 23:26:03 -0800 (PST) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, Doug Gilbert , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] scsi: avoid a double-fetch and a redundant copy Date: Wed, 9 Jan 2019 01:25:57 -0600 Message-Id: <20190109072557.9818-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP What we need is only "pack_id", so do not create a heap object or copy the whole object in. The fix efficiently copies "pack_id" only and also avoids double-fetch. Signed-off-by: Kangjie Lu --- drivers/scsi/sg.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index c6ad00703c5b..13662c41058a 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -446,16 +446,8 @@ sg_read(struct file *filp, char __user *buf, size_t count, loff_t * ppos) } if (old_hdr->reply_len < 0) { if (count >= SZ_SG_IO_HDR) { - sg_io_hdr_t *new_hdr; - new_hdr = kmalloc(SZ_SG_IO_HDR, GFP_KERNEL); - if (!new_hdr) { - retval = -ENOMEM; - goto free_old_hdr; - } - retval =__copy_from_user - (new_hdr, buf, SZ_SG_IO_HDR); - req_pack_id = new_hdr->pack_id; - kfree(new_hdr); + retval = get_user(req_pack_id, + &((sg_io_hdr_t *)buf)->pack_id); if (retval) { retval = -EFAULT; goto free_old_hdr;