osmosis and diffusion are both passive transport (meaning there is no expenditure of energy involved0, so in otherwords they cross a concentration gradient, being from high concentration to low concentration, not going against the gradiet.
osmosis refers to the transport of water across a semi-permeable membrane. only water
diffusion is the transport of the actual substance across the semi permeable membrane, weather it'd be proteins or wateva, the wall selectively choose which substances to pass through
so osmosis and diffusion both involve transport across a membrane except one transfers only water whereas the other transports the substance