From patchwork Sat Apr 19 14:43:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 340486 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 874BD1400E8 for ; Sun, 20 Apr 2014 00:43:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754867AbaDSOnX (ORCPT ); Sat, 19 Apr 2014 10:43:23 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:48271 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752115AbaDSOnU (ORCPT ); Sat, 19 Apr 2014 10:43:20 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 95F1A3404EA; Sat, 19 Apr 2014 14:43:19 +0000 (UTC) From: Mike Frysinger To: YOSHIFUJI Hideaki Cc: netdev@vger.kernel.org, David Heidelberger Subject: [PATCH [iputils] 5/5] tftpd: check return value of set*id calls Date: Sat, 19 Apr 2014 10:43:17 -0400 Message-Id: <1397918597-8680-5-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1397918597-8680-1-git-send-email-vapier@gentoo.org> References: <1397918597-8680-1-git-send-email-vapier@gentoo.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Mike Frysinger --- tftpd.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tftpd.c b/tftpd.c index 2a39ec4..6519de3 100644 --- a/tftpd.c +++ b/tftpd.c @@ -109,17 +109,20 @@ int main(int ac, char **av) register int n = 0; int on = 1; + openlog("tftpd", LOG_PID, LOG_DAEMON); + /* Sanity. If parent forgot to setuid() on us. */ if (geteuid() == 0) { - setgid(65534); - setuid(65534); + if (setgid(65534) || setuid(65534)) { + syslog(LOG_ERR, "set*id failed: %m\n"); + exit(1); + } } ac--; av++; while (ac-- > 0 && n < MAXARG) dirs[n++] = *av++; - openlog("tftpd", LOG_PID, LOG_DAEMON); if (ioctl(0, FIONBIO, &on) < 0) { syslog(LOG_ERR, "ioctl(FIONBIO): %m\n"); exit(1);