From patchwork Tue Apr 15 15:19:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 3993771 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 483FA9F2CC for ; Tue, 15 Apr 2014 15:19:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 817172022A for ; Tue, 15 Apr 2014 15:19:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 786332020F for ; Tue, 15 Apr 2014 15:19:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754710AbaDOPTn (ORCPT ); Tue, 15 Apr 2014 11:19:43 -0400 Received: from mail-qc0-f171.google.com ([209.85.216.171]:52309 "EHLO mail-qc0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754703AbaDOPTl (ORCPT ); Tue, 15 Apr 2014 11:19:41 -0400 Received: by mail-qc0-f171.google.com with SMTP id c9so10486240qcz.16 for ; Tue, 15 Apr 2014 08:19:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Wu05T2GVZ//NPsw128Zj63u33j/rpW0LKkWSLWXJ3x8=; b=lF21s668P56pJFKMnaFfkTF5M+9w6JZ6hBVEbr4ny+Eo2SdYq5/M1cHf3DLjbQbnSu V822UuBD8effORoVxVTf6RIA1W5klA+FQswZ1zW/Mr3qBE1+f1meaM4DAeiNRsCz19cW qGJOMFU4z2enVBTxJa2nqtyPDkAqFPJpjfgxiBu+DzTyMtAE07wPdbwjG+IJmFxI4yF9 bO79oec5yP8Yw/87/0neJ2uWZtpwA/Kk/iTYkqOtRj84uHPZYxD0LOq8dofbKBMy/5ji ktNSlZzHvHCtHzXGGDbO1zSGR+ULWcyPC+WfFf/XB9OGDek6Mr7V+dI3P8p8OS8gTIum fcag== X-Gm-Message-State: ALoCoQm+ImM1YXGugy0tcWmZFN/q5k/5Nx/PoHXTMX03fT+H/MeYRvBaJiGXgJBmCh1iz+aXNVxH X-Received: by 10.140.24.33 with SMTP id 30mr3408639qgq.40.1397575180630; Tue, 15 Apr 2014 08:19:40 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id g64sm24918763qgf.22.2014.04.15.08.19.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Apr 2014 08:19:40 -0700 (PDT) From: Jeff Layton To: steved@redhat.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 1/6] gssd: handle malloc failure appropriately in do_downcall Date: Tue, 15 Apr 2014 11:19:27 -0400 Message-Id: <1397575172-28377-2-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1397575172-28377-1-git-send-email-jlayton@redhat.com> References: <1397575172-28377-1-git-send-email-jlayton@redhat.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ...and get rid of some pointless NULL ptr checks. Signed-off-by: Jeff Layton --- utils/gssd/gssd_proc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c index 33cfeb2afd2e..5f7fb32c41b5 100644 --- a/utils/gssd/gssd_proc.c +++ b/utils/gssd/gssd_proc.c @@ -694,6 +694,9 @@ do_downcall(int k5_fd, uid_t uid, struct authgss_private_data *pd, sizeof(pd->pd_ctx_hndl.length) + pd->pd_ctx_hndl.length + sizeof(context_token->length) + context_token->length; p = buf = malloc(buf_size); + if (!buf) + goto out_err; + end = buf + buf_size; /* context_timeout set by -t option overrides context lifetime */ @@ -706,10 +709,10 @@ do_downcall(int k5_fd, uid_t uid, struct authgss_private_data *pd, if (write_buffer(&p, end, context_token)) goto out_err; if (write(k5_fd, buf, p - buf) < p - buf) goto out_err; - if (buf) free(buf); + free(buf); return 0; out_err: - if (buf) free(buf); + free(buf); printerr(1, "Failed to write downcall!\n"); return -1; }