From patchwork Mon Jun 20 18:33:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 898002 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5KIVDiE008528 for ; Mon, 20 Jun 2011 18:33:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755046Ab1FTSdV (ORCPT ); Mon, 20 Jun 2011 14:33:21 -0400 Received: from mail-qy0-f174.google.com ([209.85.216.174]:40385 "EHLO mail-qy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753330Ab1FTSdV (ORCPT ); Mon, 20 Jun 2011 14:33:21 -0400 Received: by qyk29 with SMTP id 29so1661212qyk.19 for ; Mon, 20 Jun 2011 11:33:20 -0700 (PDT) Received: by 10.224.208.68 with SMTP id gb4mr4231682qab.8.1308594800406; Mon, 20 Jun 2011 11:33:20 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-076-182-054-018.nc.res.rr.com [76.182.54.18]) by mx.google.com with ESMTPS id e18sm3344443qcs.41.2011.06.20.11.33.19 (version=SSLv3 cipher=OTHER); Mon, 20 Jun 2011 11:33:19 -0700 (PDT) From: Jeff Layton To: smfrench@gmail.com Cc: bfields@fieldses.org, linux-cifs@vger.kernel.org Subject: [PATCH] cifs: free blkcipher in smbhash Date: Mon, 20 Jun 2011 14:33:16 -0400 Message-Id: <1308594796-29004-1-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.5.4 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 20 Jun 2011 18:33:21 +0000 (UTC) This is currently leaked in the rc == 0 case. Reported-by: J. Bruce Fields Signed-off-by: Jeff Layton Reviewed-by: Shirish Pargaonkar --- fs/cifs/smbencrypt.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/cifs/smbencrypt.c b/fs/cifs/smbencrypt.c index 1525d5e..1c5b770 100644 --- a/fs/cifs/smbencrypt.c +++ b/fs/cifs/smbencrypt.c @@ -90,12 +90,10 @@ smbhash(unsigned char *out, const unsigned char *in, unsigned char *key) sg_init_one(&sgout, out, 8); rc = crypto_blkcipher_encrypt(&desc, &sgout, &sgin, 8); - if (rc) { + if (rc) cERROR(1, "could not encrypt crypt key rc: %d\n", rc); - crypto_free_blkcipher(tfm_des); - goto smbhash_err; - } + crypto_free_blkcipher(tfm_des); smbhash_err: return rc; }