From patchwork Thu Sep 21 20:57:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9964811 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4C3156056A for ; Thu, 21 Sep 2017 20:59:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3ED7326D05 for ; Thu, 21 Sep 2017 20:59:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 33C852938F; Thu, 21 Sep 2017 20:59:32 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 D9A5E26D05 for ; Thu, 21 Sep 2017 20:59:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751853AbdIUU7U (ORCPT ); Thu, 21 Sep 2017 16:59:20 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:38665 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751847AbdIUU7L (ORCPT ); Thu, 21 Sep 2017 16:59:11 -0400 Received: by mail-pg0-f68.google.com with SMTP id m30so4036076pgn.5; Thu, 21 Sep 2017 13:59:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ltEI2j7eZkZWGWMSsI5wsBpjBG9SbVVIQgUjK4OOxJk=; b=XgBFG6qOSBW2zFc2JO4tKOukDkEArPdwpfOzgMrhNgK9HsDCy2gz8IZjeICELSjqLS bUCeSbvAgi0BsvuHlUOo8Yjc9woukGCxfi6hm26mkWlZhMdeMfbyoiviavvJ2vGC6y8u s+m+1v3Rke3O7H98nSnx8oWwu0ypMcM1TrM2gWCvocdbq+BIoeLq7TtzOzK7Ej1cANPF I7acIxCGkqnHDJaAApDeDvNG8lFa/So5pU4Ni+wkpkyPi5yZMLKcgYzsApk1k4OmA8OY GGh/YSPatBKrkrnBPP6i5Lo9IAd6a0yqODcrBdGUrjzxcoK54S1/ZNmwJJOrLsiK6j0l cIFQ== 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=ltEI2j7eZkZWGWMSsI5wsBpjBG9SbVVIQgUjK4OOxJk=; b=IdA68ZznGyqTszS0L9qTiPDQhhUuc2fsdJihs8GXNh5krvZUHtXBVBfpv27PwHBD8t RDO4T88LgxFEVuOhfvCPYd4rLNC+fbuvgsvKIE21RRHk3wB8VnfsYrW06bJoPjjzsybk h9avoHEiwNdWL9dkrj9xc9vlczPByIGUVWpdJcEdwIGjF1eTwkhlybqA67TLemHG54kC 3z8NNAPO5aIWtj6F/dBnOc0b/imhuCRbs3Mw66D401KH60LzgQc5ruJwGHOd/4gT6ngs KNeef2A/D1kuvVEGI4R24ot8yBUJwuWbC8qyVUeeSSn9KtKgo8jmGH5TK8DQJr1fgUNg eSqA== X-Gm-Message-State: AHPjjUiPJEEUcDB3sHoYhWStNvIhePjlkNfoZJEUQtEkOfgHO7t7WNZ2 SmuFrNoqv7aYFGkN//2/6Mp7S3BNO90= X-Google-Smtp-Source: AOwi7QD/ANZWI0fmlBNdMGKyecSCk0dBnOmI6YRrlOwyJWslLOuZKfWKEZkmee36bUNnR8EHAWN/yg== X-Received: by 10.98.139.130 with SMTP id e2mr6801423pfl.316.1506027550654; Thu, 21 Sep 2017 13:59:10 -0700 (PDT) Received: from ebiggers-linuxstation.kir.corp.google.com ([100.66.174.81]) by smtp.gmail.com with ESMTPSA id k13sm3488028pgo.51.2017.09.21.13.59.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 13:59:10 -0700 (PDT) From: Eric Biggers To: keyrings@vger.kernel.org Cc: David Howells , Michael Halcrow , linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Biggers Subject: [PATCH v2 3/3] KEYS: use kmemdup() in request_key_auth_new() Date: Thu, 21 Sep 2017 13:57:42 -0700 Message-Id: <20170921205742.144596-4-ebiggers3@gmail.com> X-Mailer: git-send-email 2.14.1.821.g8fa685d3b7-goog In-Reply-To: <20170921205742.144596-1-ebiggers3@gmail.com> References: <20170921205742.144596-1-ebiggers3@gmail.com> Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers kmemdup() is preferred to kmalloc() followed by memcpy(). Signed-off-by: Eric Biggers --- security/keys/request_key_auth.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c index 2df92b619a38..9d536f9e5222 100644 --- a/security/keys/request_key_auth.c +++ b/security/keys/request_key_auth.c @@ -163,9 +163,10 @@ struct key *request_key_auth_new(struct key *target, const void *callout_info, rka = kzalloc(sizeof(*rka), GFP_KERNEL); if (!rka) goto error_free_rka; - rka->callout_info = kmalloc(callout_len, GFP_KERNEL); + rka->callout_info = kmemdup(callout_info, callout_len, GFP_KERNEL); if (!rka->callout_info) goto error_free_rka; + rka->callout_len = callout_len; /* see if the calling process is already servicing the key request of * another process */ @@ -196,8 +197,6 @@ struct key *request_key_auth_new(struct key *target, const void *callout_info, rka->target_key = key_get(target); rka->dest_keyring = key_get(dest_keyring); - memcpy(rka->callout_info, callout_info, callout_len); - rka->callout_len = callout_len; /* allocate the auth key */ sprintf(desc, "%x", target->serial);