From patchwork Tue Feb 2 17:17:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Herrmann X-Patchwork-Id: 577263 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 569BC14017E for ; Wed, 3 Feb 2016 04:18:22 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=WWpHXugp; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933692AbcBBRSQ (ORCPT ); Tue, 2 Feb 2016 12:18:16 -0500 Received: from mail-wm0-f54.google.com ([74.125.82.54]:35201 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932649AbcBBRSN (ORCPT ); Tue, 2 Feb 2016 12:18:13 -0500 Received: by mail-wm0-f54.google.com with SMTP id r129so128269757wmr.0 for ; Tue, 02 Feb 2016 09:18:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=OtzGooSGV2eSUe8qYRSHakPnepM1Rmr1KUAQeJUSYSo=; b=WWpHXugpPNwszOteORYC+SiutIUykSB71tkzR9KLakKy34BQYlYhblVV/pnuEdg/NN q8zo72Az9ElnEkwrOlUgu90I/NSTE+jaPCNVnRDaPrtFrElPUS7gJ7LzLn5p/utmCorp hlk21CGFv6GD/JOn8pik7MQZpBR20WNNXuROsv8R8SwHXwnfmustMrWp+2kkwa6b5thN GV2O7nHDkR3U5Sqq/x+MWBpz5KwB9TtibliQJnWRsOd/YjFOk1lkLJwD7S1nVNuXfG6Z UdgnbM7XonIXTomIErADOWInjW6rOPiJskFI1kqNNShbTG1AsSK4xYww5SbT/IGMCASW p3Aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=OtzGooSGV2eSUe8qYRSHakPnepM1Rmr1KUAQeJUSYSo=; b=CCjsZSh+guz5pqy6ctDTfyn3YoDqSCC744Lzw1HdWBquINTbAX9qQRvnSSWac3nApK kasLGehst/jG2bqb0hUkDV1K2U7INuxJDxfTvfIneKpJ/5o8V4xheHZfq8Vn5QQRlF+p nuvpW6Ii+ai/wc3knA68c4hDFdk6bbTX79BkZJRJHhZ+MyOPbQclz2DrTK8IjgoMSY47 Dj5LOJL2SySRla2BvaE8iJtl8Qm0Ipr6/EEBEOjEBGTINIc8OElplz/LM68nGV6x2wx7 qgcbaeRnU+AL1tRD72Whv8Ih1KkqEvzRFk+md4NL6Vf8bu225Av6JFTQg3bbIOmmGSDO ZsPg== X-Gm-Message-State: AG10YORiIP/esGLa+JnPnzvOuZVO46BPWD33rN/QkzBrpNwPDQprnTk6cfVh+IJkfW28CA== X-Received: by 10.28.45.71 with SMTP id t68mr5443065wmt.46.1454433492104; Tue, 02 Feb 2016 09:18:12 -0800 (PST) Received: from david-t2.localdomain ([37.120.18.12]) by smtp.gmail.com with ESMTPSA id e198sm3901545wmd.0.2016.02.02.09.18.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Feb 2016 09:18:11 -0800 (PST) From: David Herrmann To: netdev@vger.kernel.org Cc: "David S . Miller" , David Herrmann Subject: [PATCH] net: drop write-only stack variable Date: Tue, 2 Feb 2016 18:17:54 +0100 Message-Id: <1454433474-8888-1-git-send-email-dh.herrmann@gmail.com> X-Mailer: git-send-email 2.7.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove a write-only stack variable from unix_attach_fds(). This is a left-over from the security fix in: commit 712f4aad406bb1ed67f3f98d04c044191f0ff593 Author: willy tarreau Date: Sun Jan 10 07:54:56 2016 +0100 unix: properly account for FDs passed over unix sockets Signed-off-by: David Herrmann Acked-by: Hannes Frederic Sowa --- net/unix/af_unix.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index c5bf5ef..9f88193 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -1534,7 +1534,6 @@ static int unix_attach_fds(struct scm_cookie *scm, struct sk_buff *skb) { int i; unsigned char max_level = 0; - int unix_sock_count = 0; if (too_many_unix_fds(current)) return -ETOOMANYREFS; @@ -1542,11 +1541,9 @@ static int unix_attach_fds(struct scm_cookie *scm, struct sk_buff *skb) for (i = scm->fp->count - 1; i >= 0; i--) { struct sock *sk = unix_get_socket(scm->fp->fp[i]); - if (sk) { - unix_sock_count++; + if (sk) max_level = max(max_level, unix_sk(sk)->recursion_level); - } } if (unlikely(max_level > MAX_RECURSION_LEVEL)) return -ETOOMANYREFS;