Diffusion is a passive process which molecules diffuse from an area of high concentration to an area of low concentration, down a concentration gradient.
Osmosis is the diffusion of water molecule from an area of high water concentration to an area of low water concentration, through a selectively permeable membrane.