Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp4835930iob; Mon, 9 May 2022 02:48:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6ZjTu/HqnqHEVAF0vHoHdCadNC3cgMSfiOVWZHSiR3E3fPDsy+vmcRwBAV+Qt+yCuLIog X-Received: by 2002:a63:2b8b:0:b0:3c1:f789:4d19 with SMTP id r133-20020a632b8b000000b003c1f7894d19mr12496422pgr.522.1652089689783; Mon, 09 May 2022 02:48:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652089689; cv=none; d=google.com; s=arc-20160816; b=ltvyITZUGXCPDlXo4DIQoI4U3nIf5lWKsQNzQZg4G4LL/B3za/1KMupq2vC+8NuxQD 3o5YbzDBGMsyA03/xofUuG7tJI7JMRchg5bJvR+bnQkADCuOyGXfXDBq1u39pLNcTu+7 DLlA+r2s0DuMdplOo8r69RbvDHack9xcW9qDGJ9emf38/I4RlJgfuvjCmV4WDJb2jQTR cVz3jkJe6GMWUtGl6ENQXZuVfykzMlz/vkWdL5kky8mgaTfYeK+SoobquFFH3K9o8JK+ MCS5MwsYgf9VSaJc0F5dm6iOXUDXWNNQbostyvLMNim9I4lHPN2nXqfWsTkBDqWVrzH3 OpfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FUsOgOHV+tN7pFO9JWGFJ/kqTiCIqRW0RMFFQSN7GVM=; b=zr5V9C9LNhdE1FYoSsR3thJgZ3HNg859KcCOabp7rD9nbAIJhVoiO3OfQSK0efM8T3 15diDftFQ1RaBHJTWygXMdIu7Azd0jKgfaDk5hf6G4wE/l9YUj0HX6CtmeI+EzK+1aDR nWHn5cNF2Mcqec9WjNBU3SHEwSrem5yXOvteJQ4ZJT6IZ5329QAbiO4VcvxOIq6VZmlK wS2D6AyKBY+E0o5rCWRUw3+8xDNseSgyHCmHU1VlvW2+55VrDW6KDm1Z2NbiEoSsjGRQ SK4tbjFlEg/UV+dDQvolhRq5v1A1+sN1QmWQLgoxKOb9VvZtvgO79hTFosnL7Ntg6Xi5 sSGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Bh7xyKWd; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id e4-20020a170902744400b00153e9a38290si10076124plt.264.2022.05.09.02.48.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 02:48:09 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Bh7xyKWd; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 728071DAFB2; Mon, 9 May 2022 02:31:23 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357184AbiEDRbJ (ORCPT + 99 others); Wed, 4 May 2022 13:31:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356813AbiEDRJo (ORCPT ); Wed, 4 May 2022 13:09:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76B5E21806; Wed, 4 May 2022 09:55:46 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F2431616B8; Wed, 4 May 2022 16:55:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4CD14C385A5; Wed, 4 May 2022 16:55:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683345; bh=xh0CIvo5OSsNTrwskNOMVvGcZpqhPK91MF32l7lHP9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bh7xyKWd/U3EpowSL3G69W9YRgcz7vMc2uwuDrLhNeTyCcSNaSDyMIkkp3b730aSs 9Grs0aNPVUNyVNIo5DYqEoT0IvCavv3cF9B7YZFNa04U8mM8rEZ+32I1PeBAgm3cIJ JKNTQyee01NtcINznbyN94xson2pYgCjgT8+reEM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Todd Kjos , stable , Alessandro Astone Subject: [PATCH 5.17 032/225] binder: Gracefully handle BINDER_TYPE_FDA objects with num_fds=0 Date: Wed, 4 May 2022 18:44:30 +0200 Message-Id: <20220504153113.119453489@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alessandro Astone commit ef38de9217a04c9077629a24652689d8fdb4c6c6 upstream. Some android userspace is sending BINDER_TYPE_FDA objects with num_fds=0. Like the previous patch, this is reproducible when playing a video. Before commit 09184ae9b575 BINDER_TYPE_FDA objects with num_fds=0 were 'correctly handled', as in no fixup was performed. After commit 09184ae9b575 we aggregate fixup and skip regions in binder_ptr_fixup structs and distinguish between the two by using the skip_size field: if it's 0, then it's a fixup, otherwise skip. When processing BINDER_TYPE_FDA objects with num_fds=0 we add a skip region of skip_size=0, and this causes issues because now binder_do_deferred_txn_copies will think this was a fixup region. To address that, return early from binder_translate_fd_array to avoid adding an empty skip region. Fixes: 09184ae9b575 ("binder: defer copies of pre-patched txn data") Acked-by: Todd Kjos Cc: stable Signed-off-by: Alessandro Astone Link: https://lore.kernel.org/r/20220415120015.52684-1-ales.astone@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/android/binder.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -2486,6 +2486,9 @@ static int binder_translate_fd_array(str struct binder_proc *proc = thread->proc; int ret; + if (fda->num_fds == 0) + return 0; + fd_buf_size = sizeof(u32) * fda->num_fds; if (fda->num_fds >= SIZE_MAX / sizeof(u32)) { binder_user_error("%d:%d got transaction with invalid number of fds (%lld)\n",