From patchwork Tue Mar 11 03:09:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 14010978 Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3F2B6AD3 for ; Tue, 11 Mar 2025 03:10:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741662613; cv=none; b=RyOKnEd2WrlQ0O/j6o27sxv8wYyadiQCmWCPDpH5vxrTuzerqJIq2pEGSYb2C05JOD0kgpKow8+ZU17W6a8fxuq/hnLRNSYJhsHaXvsLK+qf6tCJZD2Ar8zduxs+52r+lolhmCP3LV9k8X5e1yEgkSy1NVjqqx7FgusRxhCqYdk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741662613; c=relaxed/simple; bh=0x2p6opO4wcJGCxE0ic2d/QTtFvZPmO4JEq0iguuVJU=; h=MIME-Version:From:Date:Message-ID:Subject:To:Cc:Content-Type; b=JJ8+AYceOPIZCilolEOkOdxIIqPoI+ZlaSqs4mFnoRteeBdCLZ3L4oTBa+NW7WUB2WZtAvkRE/3ViXzO+HaZWtRhQkOYcmjwe00Gd9YJJ8UIAQfgR34Qsbj4PkHFT/bQwzzzSI77h/LZcdwOLCDeBXG+RGSSEsm49Ky3OM1yTbk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CMFC2MMa; arc=none smtp.client-ip=209.85.208.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CMFC2MMa" Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-5e614da8615so948184a12.1 for ; Mon, 10 Mar 2025 20:10:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741662609; x=1742267409; darn=vger.kernel.org; h=cc:to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=8rhcitOYrqxP9erHkLxD9laxmF8PKh1UUsigNJPPPio=; b=CMFC2MMa0V6yudoDQzbXY8MoW1dTRwfLm3fSxzWfoon7R/sCnvUTgP0GChRrU0acl7 bX5Ty1S9dCMskV/i6b2L6/yyBYgji63njJJc0p4bdp/925iUNk6plKT+tPt0O7Vmppu7 HNpY/6e6sVscMTuVVxIf8+EkdYLloj5cog07NKkDyptTpT+YP9za53UO2mpdx02agzBN 0SrOE1fOrPS6sAQ3YSrXpJ1dUD+wIb3Zk1TFSGyVKmbv7mDusTeWgj0rgzqpH4mipYmH Ff5h5z23//d7L/FyFX+PRlKrv53diSXVJYrvel3eQcjtK7tKWEuljLUqoFDWgx9VxVGd /d3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741662609; x=1742267409; h=cc:to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=8rhcitOYrqxP9erHkLxD9laxmF8PKh1UUsigNJPPPio=; b=SmeSANCl9Jtt/9/QEtYpcpushl8BuWjCtqa2mcwdWqGEN6tx7eZwjwBbX5uK4zlCYH HL9nHBz9tLAQufQt8nRw4q8ofDSeTx5cGq9O3ul4VQuC/R+Pw9OMF8IIsMM70tR0GwTz iwTgc07dUVb3QjfgxOKCNQiqyvSpIWrYHT7UrrCEIP7gKGdz0xLVh0Bsgsqja68eMSYn o+JCYq1+c7gwh/PNi0yQ4A/7Tsx6IVQ0eMenQFWyooxv4GLfBiyTtgpa+6+HN/ot2USq AMH9v8uyX2szXObDg2AAdrrQregVhkmAu3YwwsoKKk40A+/0BnhHgVLeGbaFL4iPwEbv 39Cw== X-Gm-Message-State: AOJu0YxLq6mvmoMQJvhk5LxnD+wQFaqodIqLa5J48Iq71FsOsu/0t89s eew03vsiCHv83gwJ3ZWlONx7XwBKUOtUnwSjdxjsn26O/zxb02G2FnTq9fNaQBBQMd/xHIuj8kk lI5UmuPTJ1NTcsPeLLPYrk5ggho/94A== X-Gm-Gg: ASbGncufomW0nJ2aoacdROLX8wMgOdfgfrj2pl7H6QKXtyBGz2oFGecQsQu3W75eTXS FucxibL20+OjrIt4/basksiy6g4JsfJ7SBcNpenKMyt30lF7n4YpQz3soB6jUk4QxsKl9nqMEM2 KM0BeOjW+N/giGn3jgTfne5dtLwbs3+h6PTwcGX5eHSZtk+CUJYVeg//coY77J X-Google-Smtp-Source: AGHT+IGPoDO1jWS/ydBPyfzIkxDt0f79IWphwX4yollIHWgM+abt7TTNRj5orL+ucviSGdA2qdrcf9Zoc1YrHqfPUJc= X-Received: by 2002:a05:6402:5cb:b0:5de:572c:72cf with SMTP id 4fb4d7f45d1cf-5e7631dbdd9mr1588013a12.10.1741662609194; Mon, 10 Mar 2025 20:10:09 -0700 (PDT) Precedence: bulk X-Mailing-List: linux-cifs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Steve French Date: Mon, 10 Mar 2025 22:09:56 -0500 X-Gm-Features: AQ5f1JrvNkNIzPMUS4_SvD_GgWKs1f331kTlH7Mi67UVG1yVZ5K7WCGG_enXxGY Message-ID: Subject: two patches added to cifs-utils for-next branch To: CIFS Cc: =?utf-8?q?Pavel_Filipensk=C3=BD?= See attached. Also added to my smb3-utils repo on github If any objections or review comments, let us know. From 901409a2ef6bb5b72a6f774713f754ec7cc3eca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Wed, 9 Oct 2024 12:37:12 +0200 Subject: [PATCH 1/2] cldap_ping: Fix socket fd leak MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit reported by Red Hat code analyzer: cifs-utils-7.1/cldap_ping.c:323:3: leaked_handle: Handle variable "sock" going out of scope leaks the handle. Signed-off-by: Pavel Filipenský Signed-off-by: Steve French --- cldap_ping.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cldap_ping.c b/cldap_ping.c index a603be3..5c20f84 100644 --- a/cldap_ping.c +++ b/cldap_ping.c @@ -318,9 +318,11 @@ int cldap_ping(char *domain, sa_family_t family, void *addr, char *site_name) { struct timeval timeout = {.tv_sec = 2, .tv_usec = 0}; if (setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(timeout)) < 0) { + close(sock); return CLDAP_PING_NETWORK_ERROR; } if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)) < 0) { + close(sock); return CLDAP_PING_NETWORK_ERROR; } -- 2.43.0