From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EE23C43381 for ; Mon, 25 Feb 2019 21:34:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D7F80217F5 for ; Mon, 25 Feb 2019 21:34:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551130493; bh=82fnm5cNiriSoCNjWjwL0x+y60ZvIU2PfSUr/HCse90=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oFcN17GrrkLsAfHEx98AOZnhCOmLD6+d8I9XsuNQj2r3IMRIxnnZAhOviHKq2mRmj jVzz5CPGD52ln3ZTf1wNJs9QAiOgrNjFHbkbFZ4GwItA0mjZjNlnGPbWLt4lFRuhQn ssrEO4JPj6TFMX8uYBabRFH3nizoW9A1VdsU/wHs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732681AbfBYVev (ORCPT ); Mon, 25 Feb 2019 16:34:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:40986 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732873AbfBYVet (ORCPT ); Mon, 25 Feb 2019 16:34:49 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B5E3A217F5; Mon, 25 Feb 2019 21:34:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551130489; bh=82fnm5cNiriSoCNjWjwL0x+y60ZvIU2PfSUr/HCse90=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JXuHpBuwgdS4KLfydr27d11tY6qsgrbbMmCWPV2pR3ypIOuxLfYOul9Fc+0qaJvS4 vQlSr6RwUcNrm5bIAiTLoKqq7dvClp29aKDN7GaUwRq86MmMavwUS9Cs5Wi/kUhCIA tQyetjog90+b08J3eECzeOlsI1uiLEVNyI6BwYHw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Robert OCallahan , Johannes Berg , "David S. Miller" Subject: [PATCH 4.20 136/183] net: socket: fix SIOCGIFNAME in compat Date: Mon, 25 Feb 2019 22:11:49 +0100 Message-Id: <20190225195117.825311723@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225195054.748060397@linuxfoundation.org> References: <20190225195054.748060397@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johannes Berg [ Upstream commit c6c9fee35dc27362b7bac34b2fc9f5b8ace2e22c ] As reported by Robert O'Callahan in https://bugzilla.kernel.org/show_bug.cgi?id=202273 reverting the previous changes in this area broke the SIOCGIFNAME ioctl in compat again (I'd previously fixed it after his previous report of breakage in https://bugzilla.kernel.org/show_bug.cgi?id=199469). This is obviously because I fixed SIOCGIFNAME more or less by accident. Fix it explicitly now by making it pass through the restored compat translation code. Cc: stable@vger.kernel.org Fixes: 4cf808e7ac32 ("kill dev_ifname32()") Reported-by: Robert O'Callahan Signed-off-by: Johannes Berg Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/net/socket.c +++ b/net/socket.c @@ -2999,6 +2999,7 @@ static int compat_ifreq_ioctl(struct net case SIOCGIFTXQLEN: case SIOCGMIIPHY: case SIOCGMIIREG: + case SIOCGIFNAME: if (copy_in_user(uifr32, uifr, sizeof(*uifr32))) err = -EFAULT; break; @@ -3222,6 +3223,7 @@ static int compat_sock_ioctl_trans(struc case SIOCSIFTXQLEN: case SIOCBRADDIF: case SIOCBRDELIF: + case SIOCGIFNAME: case SIOCSIFNAME: case SIOCGMIIPHY: case SIOCGMIIREG: @@ -3236,7 +3238,6 @@ static int compat_sock_ioctl_trans(struc case SIOCBONDRELEASE: case SIOCBONDSETHWADDR: case SIOCBONDCHANGEACTIVE: - case SIOCGIFNAME: return sock_do_ioctl(net, sock, cmd, arg); }