netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 6.1] netfilter: Null pointer dereference in nf_tables_updobj
@ 2023-01-17 15:45 Alok Tiwari
  2023-01-17 15:52 ` Pablo Neira Ayuso
  0 siblings, 1 reply; 2+ messages in thread
From: Alok Tiwari @ 2023-01-17 15:45 UTC (permalink / raw)
  To: linux-kernel, netfilter-devel, pablo; +Cc: alok.a.tiwari, darren.kenny

static analyzer detect null pointer dereference case for 'type'
function __nft_obj_type_get() can return NULL value which require to handle
if type is NULL pointer return -ENOENT

Signed-off-by: Alok Tiwari <alok.a.tiwari@oracle.com>
---
 net/netfilter/nf_tables_api.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 3ba8c291fcaa..dca5352bdf3d 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -6951,6 +6951,9 @@ static int nf_tables_newobj(struct sk_buff *skb, const struct nfnl_info *info,
 			return -EOPNOTSUPP;
 
 		type = __nft_obj_type_get(objtype);
+		if (WARN_ON_ONCE(!type))
+			return -ENOENT;
+
 		nft_ctx_init(&ctx, net, skb, info->nlh, family, table, NULL, nla);
 
 		return nf_tables_updobj(&ctx, type, nla[NFTA_OBJ_DATA], obj);
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2 6.1] netfilter: Null pointer dereference in nf_tables_updobj
  2023-01-17 15:45 [PATCH v2 6.1] netfilter: Null pointer dereference in nf_tables_updobj Alok Tiwari
@ 2023-01-17 15:52 ` Pablo Neira Ayuso
  0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2023-01-17 15:52 UTC (permalink / raw)
  To: Alok Tiwari; +Cc: linux-kernel, netfilter-devel, darren.kenny

On Tue, Jan 17, 2023 at 07:45:49AM -0800, Alok Tiwari wrote:
> static analyzer detect null pointer dereference case for 'type'
> function __nft_obj_type_get() can return NULL value which require to handle
> if type is NULL pointer return -ENOENT

Applied, thanks.

I have appended:

This should not ever happen, because if an object is found, then that
implies there is an object type, but let's add this as a failsafe check.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-01-17 15:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-17 15:45 [PATCH v2 6.1] netfilter: Null pointer dereference in nf_tables_updobj Alok Tiwari
2023-01-17 15:52 ` Pablo Neira Ayuso

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).