rpmsg: assume zero as an invalid address to detect the uninitialized case

xiaoxiang781216 · xiaoxiang781216 · commit 839802914773 · 2020-04-24T03:50:43.000+08:00
Signed-off-by: Xiang Xiao &lt;xiaoxiang@xiaomi.com&gt;
diff --git a/lib/include/openamp/rpmsg.h b/lib/include/openamp/rpmsg.h
@@ -146,8 +146,7 @@ int rpmsg_send_offchannel_raw(struct rpmsg_endpoint *ept, uint32_t src,
  */
 static inline unsigned int is_rpmsg_ept_ready(struct rpmsg_endpoint *ept)
 {
-	return (ept->dest_addr != RPMSG_ADDR_ANY) &&
-		(ept->addr != RPMSG_ADDR_ANY);
+	return ept && ept->rdev && ept->dest_addr && ept->dest_addr != RPMSG_ADDR_ANY;
 }
 
 /**
diff --git a/lib/rpmsg/rpmsg.c b/lib/rpmsg/rpmsg.c
@@ -115,7 +115,7 @@ int rpmsg_send_offchannel_raw(struct rpmsg_endpoint *ept, uint32_t src,
 {
 	struct rpmsg_device *rdev;
 
-	if (!ept || !ept->rdev || !data || dst == RPMSG_ADDR_ANY)
+	if (!ept || !ept->rdev || !data || !dst || dst == RPMSG_ADDR_ANY)
 		return RPMSG_ERR_PARAM;
 
 	rdev = ept->rdev;

Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,7 @@ int rpmsg_send_offchannel_raw(struct rpmsg_endpoint *ept, uint32_t src,`
`146`	`146`	`*/`
`147`	`147`	`static inline unsigned int is_rpmsg_ept_ready(struct rpmsg_endpoint *ept)`
`148`	`148`	`{`
`149`		`- return (ept->dest_addr != RPMSG_ADDR_ANY) &&`
`150`		`- (ept->addr != RPMSG_ADDR_ANY);`
	`149`	`+ return ept && ept->rdev && ept->dest_addr && ept->dest_addr != RPMSG_ADDR_ANY;`
`151`	`150`	`}`
`152`	`151`
`153`	`152`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ int rpmsg_send_offchannel_raw(struct rpmsg_endpoint *ept, uint32_t src,`
`115`	`115`	`{`
`116`	`116`	`struct rpmsg_device *rdev;`
`117`	`117`
`118`		`- if (!ept \|\| !ept->rdev \|\| !data \|\| dst == RPMSG_ADDR_ANY)`
	`118`	`+ if (!ept \|\| !ept->rdev \|\| !data \|\| !dst \|\| dst == RPMSG_ADDR_ANY)`
`119`	`119`	`return RPMSG_ERR_PARAM;`
`120`	`120`
`121`	`121`	`rdev = ept->rdev;`