From patchwork Thu Sep 19 07:58:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Sunil Dhamne X-Patchwork-Id: 830004 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (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 80D5E194C79 for ; Thu, 19 Sep 2024 07:58:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726732701; cv=none; b=boWqiivFc8kku0T2ck3/sX+eHRZ4cY0kXb9QDeTa/Oty6Od+VxR1ifEWtkUsis8kHasOoduUfopawEZoDe22onlMe85xScjzleyLER2e7kP0/IEJyxuuAS2Srxb/Rqq2kVYbUTOHv0HoRysLpWbNJklqw6zIrPWQ8VcGTOMZJ9s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726732701; c=relaxed/simple; bh=WciClgTHJkLxD4j92bv2MUEd3DG3FNExk2qmnPfm9+U=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=h61I7xEI9NH8kcYaw2zDCjg3YnfnqE1fL4VgP/XJ/CjORYqhwSd9m3mPni/dGZMTxNbjV7MpNa/oRhy6xDIc9heFzD1tXbIF2kPjg8SR8ocZInWOeHbuk73nQXexhFK7DLvcgP8IeUuQxrJ8UtYv/IqVMvh7EAysBzwVe3/w/Cc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--amitsd.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=vjYmtvcS; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--amitsd.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="vjYmtvcS" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6886cd07673so9744077b3.3 for ; Thu, 19 Sep 2024 00:58:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1726732698; x=1727337498; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=69+vMPB39Nce2muEw4aTqVSjlA0uEHJjncDbiLtv5gU=; b=vjYmtvcS+9zGKi0YapGU/7rQlCN04LZ+3KvYpclw8MtzEsMfR9uwH8sFjmZSiSj7hp Fs+2DTLavIwQsUK8O7LjWP+qRgADPz2IV1kjp4xaXTLL+pi/o2ZKzoHGqQVDKGkYJrwv tZxK5r2LtMahQp3EiM0pUh9vjNOSrh4gn0F8BflWLtvZjY2RLuHj0rtQ6tQX6vclG+G/ JqvJjMFK00daSZ+zb0I/j/K09l66wFdGtIeZs4eyuWnod2NlLBUUjX3Au2mPqraoQsz1 G+dTs7RfKryVSUnBTwEDX+X3ckpvPua97vTRrK2eUymVPcODGGCcnTU3XT32S2d7Sw6P d7zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726732698; x=1727337498; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=69+vMPB39Nce2muEw4aTqVSjlA0uEHJjncDbiLtv5gU=; b=J5Pn6SigLiWbkOHflSQQdsRdprdq/4a9l0yxlHRaLpbh/tUvQdtfvvbq0ywaAzXN2P fxpQWprHG1zA7D4uOK2rgVFTU6DM0CMnCkPEAzs7zz+vVU/6Gf1RXxJKdB8yaeAoCMLH DZ9DEt5Rw3cIX3GNQDd0bzwszM22+BdV0BvfOICMdtchBpx/15CA0pWc6sGHkdgZyqkH H86UAP8dQFHSPiJpNCqpmS7MsVlofQONCJliAcD7RgeomedXPTFlHDA1Pj9mW1XT08ed khAMIrpMqAMdEV6TTN33LLREYoW6qdz/M94emeGox5Z7lCEqHidVnxXeV14S/ZgIkIUd HpTQ== X-Forwarded-Encrypted: i=1; AJvYcCX/2cSBvYq8SWD12+FW2CfzJD6k9sXuDxN/WQEAgRO31MK/WA0w0+wZwCi/g8TFcue9nvjhnMeTq+g=@vger.kernel.org X-Gm-Message-State: AOJu0YzgdyeC4Bsn6uy+p6KZHpCKGDF6qBB+HLA4rbHqdUwT75E/cpiq ysSzE7yO/vmy/jeMTGXJLJMV9oegplTKLRBJa+wudDqrEwODPjunvCyNQWLLhSH5sPZKrtRnrku f/w== X-Google-Smtp-Source: AGHT+IFz4w5/l29GVVe3xj63AjJzWeR5yG9Sn8t/5B2QJ8WqvAQ1J6BUi7WySrK69nuf790coN5CeJTLSs4= X-Received: from amitsd-gti.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:827]) (user=amitsd job=sendgmr) by 2002:a05:690c:6e88:b0:6de:19f:34d7 with SMTP id 00721157ae682-6de019f7ae7mr534007b3.2.1726732698562; Thu, 19 Sep 2024 00:58:18 -0700 (PDT) Date: Thu, 19 Sep 2024 00:58:12 -0700 Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.46.0.792.g87dc391469-goog Message-ID: <20240919075815.332017-1-amitsd@google.com> Subject: [PATCH v1] usb: typec: Fix arg check for usb_power_delivery_unregister_capabilities From: Amit Sunil Dhamne To: gregkh@linuxfoundation.org, heikki.krogerus@linux.intel.com Cc: badhri@google.com, kyletso@google.com, rdbabiera@google.com, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Amit Sunil Dhamne , stable@vger.kernel.org usb_power_delivery_register_capabilities() returns ERR_PTR in case of failure. usb_power_delivery_unregister_capabilities() we only check argument ("cap") for NULL. A more robust check would be checking for ERR_PTR as well. Cc: stable@vger.kernel.org Fixes: 662a60102c12 ("usb: typec: Separate USB Power Delivery from USB Type-C") Signed-off-by: Amit Sunil Dhamne Reviewed-by: Badhri Jagan Sridharan --- drivers/usb/typec/pd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 68d4209158f43a558c5553ea95ab0c8975eab18c diff --git a/drivers/usb/typec/pd.c b/drivers/usb/typec/pd.c index d78c04a421bc..761fe4dddf1b 100644 --- a/drivers/usb/typec/pd.c +++ b/drivers/usb/typec/pd.c @@ -519,7 +519,7 @@ EXPORT_SYMBOL_GPL(usb_power_delivery_register_capabilities); */ void usb_power_delivery_unregister_capabilities(struct usb_power_delivery_capabilities *cap) { - if (!cap) + if (IS_ERR_OR_NULL(cap)) return; device_for_each_child(&cap->dev, NULL, remove_pdo);