Merge tag 'Smack-for-5.19' of https://github.com/cschaufler/smack-next

torvalds · torvalds · commit a9d1046a8465 · 2022-05-24T13:13:50.000-07:00
Pull smack update from Casey Schaufler: "A single change to remove a pointless assignment" * tag 'Smack-for-5.19' of https://github.com/cschaufler/smack-next: smack: Remove redundant assignments
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c
@@ -1192,7 +1192,6 @@ static ssize_t smk_write_net4addr(struct file *file, const char __user *buf,
 			rc = -EINVAL;
 			goto free_out;
 		}
-		m = BEBITS;
 		masks = 32;
 	}
 	if (masks > BEBITS) {

Original file line number	Diff line number	Diff line change
`@@ -1192,7 +1192,6 @@ static ssize_t smk_write_net4addr(struct file file, const char __user buf,`
`1192`	`1192`	`rc = -EINVAL;`
`1193`	`1193`	`goto free_out;`
`1194`	`1194`	`}`
`1195`		`- m = BEBITS;`
`1196`	`1195`	`masks = 32;`
`1197`	`1196`	`}`
`1198`	`1197`	`if (masks > BEBITS) {`