Skip to contentSkip to conversation

tipc: remove an unnecessary NULL check

PATCH Applied Dan Carpenter 3 participants 3 messages Apr 27, 2016 – Apr 28, 2016

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tipc: remove an unnecessary NULL check

This is never called with a NULL "buf" and anyway, we dereference 's' on the lines before so it would Oops before we reach the check.

net/tipc/subscr.c +1 -2
index 79de588..0dd0224 100644
@@ -326,8 +326,7 @@ static void tipc_subscrb_rcv_cb(struct net *net, int conid,
 		return tipc_subscrp_cancel(s, subscriber);
 	}
 
-	if (s)
-		tipc_subscrp_subscribe(net, s, subscriber, swap);
+	tipc_subscrp_subscribe(net, s, subscriber, swap);
 }
 
 /* Handle one request to establish a new subscriber */
Acked-by on v1 1/1
#1 lore raw

PiBGcm9tOiBEYW4gQ2FycGVudGVyIFttYWlsdG86ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tXQ0K PiBTZW50OiAyMDE2xOo01MIyN8jVIDE2OjA1DQo+IFRvOiBKb24gTWFsb3kNCj4gQ2M6IFh1ZSwg WWluZzsgRGF2aWQgUy4gTWlsbGVyOyBuZXRkZXZAdmdlci5rZXJuZWwub3JnOyB0aXBjLQ0KPiBk aXNjdXNzaW9uQGxpc3RzLnNvdXJjZWZvcmdlLm5ldDsga2VybmVsLWphbml0b3JzQHZnZXIua2Vy bmVsLm9yZw0KPiBTdWJqZWN0OiBbcGF0Y2hdIHRpcGM6IHJlbW92ZSBhbiB1bm5lY2Vzc2FyeSBO VUxMIGNoZWNrDQo+IA0KPiBUaGlzIGlzIG5ldmVyIGNhbGxlZCB3aXRoIGEgTlVMTCAiYnVmIiBh bmQgYW55d2F5LCB3ZSBkZXJlZmVyZW5jZSAncycgb24gdGhlDQo+IGxpbmVzIGJlZm9yZSBzbyBp dCB3b3VsZCBPb3BzIGJlZm9yZSB3ZSByZWFjaCB0aGUgY2hlY2suDQo+IA0KPiBTaWduZWQtb2Zm LWJ5OiBEYW4gQ2FycGVudGVyIDxkYW4uY2FycGVudGVyQG9yYWNsZS5jb20+DQoNCkFja2VkLWJ5 OiBZaW5nIFh1ZSA8eWluZy54dWVAd2luZHJpdmVyLmNvbT4NCg0KPiANCj4gZGlmZiAtLWdpdCBh L25ldC90aXBjL3N1YnNjci5jIGIvbmV0L3RpcGMvc3Vic2NyLmMgaW5kZXggNzlkZTU4OC4uMGRk MDIyNA0KPiAxMDA2NDQNCj4gLS0tIGEvbmV0L3RpcGMvc3Vic2NyLmMNCj4gKysrIGIvbmV0L3Rp cGMvc3Vic2NyLmMNCj4gQEAgLTMyNiw4ICszMjYsNyBAQCBzdGF0aWMgdm9pZCB0aXBjX3N1YnNj cmJfcmN2X2NiKHN0cnVjdCBuZXQgKm5ldCwgaW50DQo+IGNvbmlkLA0KPiAgCQlyZXR1cm4gdGlw Y19zdWJzY3JwX2NhbmNlbChzLCBzdWJzY3JpYmVyKTsNCj4gIAl9DQo+IA0KPiAtCWlmIChzKQ0K PiAtCQl0aXBjX3N1YnNjcnBfc3Vic2NyaWJlKG5ldCwgcywgc3Vic2NyaWJlciwgc3dhcCk7DQo+ ICsJdGlwY19zdWJzY3JwX3N1YnNjcmliZShuZXQsIHMsIHN1YnNjcmliZXIsIHN3YXApOw0KPiAg fQ0KPiANCj4gIC8qIEhhbmRsZSBvbmUgcmVxdWVzdCB0byBlc3RhYmxpc2ggYSBuZXcgc3Vic2Ny aWJlciAqLw0K