From patchwork Sun Aug 20 16:33:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9911199 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 9B356600C8 for ; Sun, 20 Aug 2017 16:34:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8BF6D2874A for ; Sun, 20 Aug 2017 16:34:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 80A872875C; Sun, 20 Aug 2017 16:34:00 +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.9 required=2.0 tests=BAYES_00,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 01ED92874A for ; Sun, 20 Aug 2017 16:34:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753154AbdHTQd7 (ORCPT ); Sun, 20 Aug 2017 12:33:59 -0400 Received: from mout.web.de ([212.227.17.12]:53874 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753146AbdHTQd6 (ORCPT ); Sun, 20 Aug 2017 12:33:58 -0400 Received: from [192.168.1.2] ([92.225.240.160]) by smtp.web.de (mrweb102 [213.165.67.124]) with ESMTPSA (Nemesis) id 0MddFQ-1dvcEa04cO-00PPbv; Sun, 20 Aug 2017 18:33:56 +0200 Subject: [PATCH 1/8] CIFS: Delete 11 error messages for a failed memory allocation From: SF Markus Elfring To: linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, Steve French Cc: LKML , kernel-janitors@vger.kernel.org References: <826310e5-e01c-38af-90df-c5630f761a4d@users.sourceforge.net> Message-ID: <3b4ecd79-ac00-9aa6-ae3e-2f153525214a@users.sourceforge.net> Date: Sun, 20 Aug 2017 18:33:55 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <826310e5-e01c-38af-90df-c5630f761a4d@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:APVMDlW/DH3u79K2ybJkjjKGReFkMNBnmkyuaJDTZiqGKuEDNee 1WK4HDXE0WZqKJJKilfrk64Xa4TGkiHey+Yl6CeJRxPbSSQwSN/BgRTGqw/9k+vH2s52vtb 5rXTMWKiWSyr3SLPwFQk5pBZauRULfJJGShE/QNwuRGN3mOUQjWMXrzLE4ohKRUfqRsfOLm /SxmFXd1eKKruasyN0HcA== X-UI-Out-Filterresults: notjunk:1; V01:K0:WhTpxKWkOvY=:smwfkpTVjZWjtgzZgJxvQ4 VTL6Bi9lxOrcs3r5CIBq4wY6P0HTphGNEROKzRyAKscyiDMDqXx2OpRD6TUtU9oGmgVhhRS+g NH1auhzQgf34Rp21On4KbEEJ4nt6LNvZFOznklqBMDjB1X/l6kxL3SjdCXytEbAbBdXM+sF+D AI6xlEBPMwdykXb9bbvq069MjFnMVd7yiWUaKzvjzdOajTZyz+klo/mrt5wmlgXO2sof2IpmW YCzYj1LWTMn0VYqntDE54dFx4VOGJLFl7skhgO34lyrLR1BeiCsfSXuuzUX7vqCnheqR8W49A SDNxkORAJeIk219cjV4exKFf6rjVByBRav8Vdj//xZueBafX84v3YwqkfqBuuSK04E5Ofgliq Im1T+vBRllXmD7Q0MrO68wU1tqodNAFgY9N7M1AdB4cWNElnLHtyNOMGxkUBpNhdWZT6jdWHf nlXpORUQPYKLD1uL8aPdBrzYR+hoNnfq/L/7F7aRJ1UD3ZApKfjqaogjQLtgUz08ElItENMN0 xLO/m5REDxkLciWiMPfbs3P8xprrZDyHruXfF+lvHPClka9hMCDctKQGeq/Nm6rWoSxaTFvQR 2fEnTIOxgB77yY8s7b+vPaku9VT8wdUj3T83yUKBlBp8MHtzyiVTaxELK+PeSKKU2534Ax9pk bNlxrLGe1JJvSKDCziznnxtZy8u1iBqJo5HyhocjIvgr0sL8JyvSbDEoBFVLDF58cPIapKJoH 5GJaTgxIw5oyiLK/AfpwhPjm/77sF0LCiX9GK0mHgrdCa/I0fRE1IlXgnCJ25B23C1+lI9497 EJ/hYbFavGsKTXK/AvcjgA1K2N4e+myUgFlMdTQNFUO027+Q90= Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sun, 20 Aug 2017 14:35:36 +0200 Omit extra messages for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- fs/cifs/connect.c | 17 ++++------------- fs/cifs/sess.c | 7 ++----- fs/cifs/smb2ops.c | 1 - fs/cifs/smb2pdu.c | 6 ------ fs/cifs/smb2transport.c | 1 - 5 files changed, 6 insertions(+), 26 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 59647eb72c5f..b67a3c132a8f 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1737,10 +1737,8 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, /* Now build new password string */ temp_len = strlen(value); vol->password = kzalloc(temp_len+1, GFP_KERNEL); - if (vol->password == NULL) { - pr_warn("CIFS: no memory for password\n"); + if (!vol->password) goto cifs_parse_mount_err; - } for (i = 0, j = 0; i < temp_len; i++, j++) { vol->password[j] = value[i]; @@ -1780,10 +1778,9 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, kfree(vol->domainname); vol->domainname = kstrdup(string, GFP_KERNEL); - if (!vol->domainname) { - pr_warn("CIFS: no memory for domainname\n"); + if (!vol->domainname) goto cifs_parse_mount_err; - } + cifs_dbg(FYI, "Domain name set\n"); break; case Opt_srcaddr: @@ -1813,10 +1810,8 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, kfree(vol->iocharset); vol->iocharset = kstrdup(string, GFP_KERNEL); - if (!vol->iocharset) { - pr_warn("CIFS: no memory for charset\n"); + if (!vol->iocharset) goto cifs_parse_mount_err; - } } /* if iocharset not set then load_nls_default * is used by caller @@ -2494,8 +2489,6 @@ cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses) vol->username = kstrndup(payload, len, GFP_KERNEL); if (!vol->username) { - cifs_dbg(FYI, "Unable to allocate %zd bytes for username\n", - len); rc = -ENOMEM; goto out_key_put; } @@ -2513,8 +2506,6 @@ cifs_set_cifscreds(struct smb_vol *vol, struct cifs_ses *ses) ++delim; vol->password = kstrndup(delim, len, GFP_KERNEL); if (!vol->password) { - cifs_dbg(FYI, "Unable to allocate %zd bytes for password\n", - len); rc = -ENOMEM; kfree(vol->username); vol->username = NULL; diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index 8b0502cd39af..2fb36bbaf5b0 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -317,10 +317,9 @@ int decode_ntlmssp_challenge(char *bcc_ptr, int blob_len, if (tilen) { ses->auth_key.response = kmemdup(bcc_ptr + tioffset, tilen, GFP_KERNEL); - if (!ses->auth_key.response) { - cifs_dbg(VFS, "Challenge target info alloc failure"); + if (!ses->auth_key.response) return -ENOMEM; - } + ses->auth_key.len = tilen; } @@ -1048,8 +1047,6 @@ sess_auth_kerberos(struct sess_data *sess_data) ses->auth_key.response = kmemdup(msg->data, msg->sesskey_len, GFP_KERNEL); if (!ses->auth_key.response) { - cifs_dbg(VFS, "Kerberos can't allocate (%u bytes) memory", - msg->sesskey_len); rc = -ENOMEM; goto out_put_spnego_key; } diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index cfacf2c97e94..783b5d263704 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -1988,7 +1988,6 @@ crypt_message(struct TCP_Server_Info *server, struct smb_rqst *rqst, int enc) iv_len = crypto_aead_ivsize(tfm); iv = kzalloc(iv_len, GFP_KERNEL); if (!iv) { - cifs_dbg(VFS, "%s: Failed to alloc IV", __func__); rc = -ENOMEM; goto free_sg; } diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index 5fb2fc2d0080..668732e6f80f 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -851,9 +851,6 @@ SMB2_auth_kerberos(struct SMB2_sess_data *sess_data) ses->auth_key.response = kmemdup(msg->data, msg->sesskey_len, GFP_KERNEL); if (!ses->auth_key.response) { - cifs_dbg(VFS, - "Kerberos can't allocate (%u bytes) memory", - msg->sesskey_len); rc = -ENOMEM; goto out_put_spnego_key; } @@ -2122,9 +2119,6 @@ query_info(const unsigned int xid, struct cifs_tcon *tcon, if (!*data) { *data = kmalloc(*dlen, GFP_KERNEL); if (!*data) { - cifs_dbg(VFS, - "Error %d allocating memory for acl\n", - rc); *dlen = 0; goto qinf_exit; } diff --git a/fs/cifs/smb2transport.c b/fs/cifs/smb2transport.c index 67367cf1f8cd..abfcc759e75d 100644 --- a/fs/cifs/smb2transport.c +++ b/fs/cifs/smb2transport.c @@ -100,7 +100,6 @@ smb3_crypto_shash_allocate(struct TCP_Server_Info *server) crypto_shash_descsize(server->secmech.cmacaes); server->secmech.sdesccmacaes = kmalloc(size, GFP_KERNEL); if (!server->secmech.sdesccmacaes) { - cifs_dbg(VFS, "%s: Can't alloc cmacaes\n", __func__); kfree(server->secmech.sdeschmacsha256); server->secmech.sdeschmacsha256 = NULL; crypto_free_shash(server->secmech.hmacsha256);